diff --git a/libs/main/code/picodeparser.cpp b/libs/main/code/picodeparser.cpp
index a1c8f58a..7badf95b 100644
--- a/libs/main/code/picodeparser.cpp
+++ b/libs/main/code/picodeparser.cpp
@@ -498,6 +498,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 				MetaMap smeta = maybeMeta(pfc);
 				meta << smeta;
 			}
+			// piCout << "pfc E" << cur_namespace << "," << tmp;
 			parseEnum(0, cur_namespace + tmp, pfc.takeRange('{', '}'), meta);
 			pfc.takeSymbol();
 			continue;
@@ -613,8 +614,8 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
 	int ps                  = -1;
 	bool def                = false;
 	PIString prev_namespace = cur_namespace, stmp;
-	if (ce) cur_namespace += ce->name + s_ns;
-	// piCout << "parse class" << ce->name << "namespace" << cur_namespace;
+	if (ce) cur_namespace = ce->name + s_ns;
+	// piCout << "parse class" << (ce ? ce->name : "NULL") << "namespace" << cur_namespace;
 	// piCout << "\nparse class" << ce->name << "namespace" << cur_namespace;
 	while (!fc.isEmpty()) {
 		PIString cw = fc.takeCWord(), tmp;
@@ -666,6 +667,7 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
 				MetaMap smeta = maybeMeta(fc);
 				meta << smeta;
 			}
+			// piCout << "pc E" << cur_namespace << "," << tmp;
 			parseEnum(ce, cur_namespace + tmp, fc.takeRange('{', '}'), meta);
 			fc.takeSymbol();
 			continue;