--- a/stage4/generate_cc/search_var_instance_decl.cc	Thu Jul 19 14:07:04 2007 +0200
+++ b/stage4/generate_cc/search_var_instance_decl.cc	Fri Jul 20 22:07:15 2007 +0200
@@ -321,7 +321,7 @@
 //SYM_REF4(located_var_decl_c, variable_name, location, located_var_spec_init, unused)
     void *visit(located_var_decl_c *symbol) {
       if (symbol->variable_name != NULL && compare_identifiers(symbol->variable_name, search_name) == 0) {
-        return current_type_decl;
+        return symbol->located_var_spec_init;
       }
       else
         return NULL;