diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a66c9f5..b3ecd72b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(pip)
 set(pip_MAJOR    2)
 set(pip_MINOR    24)
-set(pip_REVISION 0)
+set(pip_REVISION 1)
 set(pip_SUFFIX   )
 set(pip_COMPANY  SHS)
 set(pip_DOMAIN   org.SHS)
diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp
index e73cb1f9..ee076a5a 100755
--- a/utils/code_model_generator/main.cpp
+++ b/utils/code_model_generator/main.cpp
@@ -418,6 +418,7 @@ void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool met
 		if (getters) {
 			f << "\n// Getters\n";
 			piForeachC (PICodeParser::Entity * e, parser.entities) {
+				if (!needClassStream(e)) continue;
 				if (!e->has_name || e->name.startsWith("_PI")) continue;
 				f << "\t(*accessValueFunctions)[\"" << e->name << "\"] = getterValue" << toCName(e->name) << ";\n";
 				f << "\t(*accessTypeFunctions)[\"" << e->name << "\"] = getterType" << toCName(e->name) << ";\n";