diff --git a/libs/main/code/picodeparser.cpp b/libs/main/code/picodeparser.cpp
index c811e63c..98954099 100644
--- a/libs/main/code/picodeparser.cpp
+++ b/libs/main/code/picodeparser.cpp
@@ -486,11 +486,14 @@ PICodeParser::MetaMap PICodeParser::parseMeta(PIString & fc) {
 	PIStringList ml = fc.split(',');
 	piForeachC (PIString & m, ml) {
 		int i = m.find('=');
-		if (i < 0) continue;
-		PIString mv = m.mid(i + 1).trim();
-		if (mv.startsWith('\"')) mv.cutLeft(1);
-		if (mv.endsWith('\"')) mv.cutRight(1);
-		ret[m.left(i).trim()] = mv;
+		if (i < 0) {
+			ret[m.trimmed()] = PIString();
+		} else {
+			PIString mv = m.mid(i + 1).trim();
+			if (mv.startsWith('\"')) mv.cutLeft(1);
+			if (mv.endsWith('\"')) mv.cutRight(1);
+			ret[m.left(i).trim()] = mv;
+		}
 	}
 	//piCout << ms << ret;
 	return ret;
diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp
index b1f81389..06f54522 100755
--- a/utils/code_model_generator/main.cpp
+++ b/utils/code_model_generator/main.cpp
@@ -277,6 +277,7 @@ void writeClassStreamMembersIn(PIFile & f, const PICodeParser::Entity * e, int &
 
 
 bool needClassStream(const PICodeParser::Entity * e) {
+	if (e->meta.contains("no-stream")) return false;
 	piForeachC (PICodeParser::Member & m, e->members) {
 		if (m.is_type_ptr || m.isBitfield() || !m.dims.isEmpty() || (m.visibility != PICodeParser::Public))
 			continue;