diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index e6d273a..ed4339b 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -120,6 +120,8 @@
 		if (res.getParent() == null) return true;
 		if (res.getChildren() == null || res.getChildren().size() == 0) return false;
 		if (res.getNumParameters() > 0 && res.getChildren().size() == 1 && res.getChildren().iterator().next().getNumParameters() > 0) return false;
+		if (res.getChildren().size() == 1 && res.getChildren().iterator().next().getNumParameters() > 0 
+				&& (res.getChildren().iterator().next().getChildren() == null || res.getChildren().iterator().next().getChildren().size() == 0)) return false;
 		return true;
 //		return res.getParent() == null || !(res.getChildren() == null || res.getChildren().size() == 0);
 	}
@@ -340,7 +342,7 @@
 						String childTypeName = getComponentName(child, langSpec);
 						String fieldName = langSpec.toVariableName(childTypeName);
 						Term childGetter = null; 
-						if ((child.getChildren() == null || child.getChildren().size() == 0) && child.getNumParameters() == 0) {
+						if (!CodeGenerator.generatesComponent(child)) {
 							// the child is not a class
 							childGetter = new Term(new Symbol("get" + childTypeName, 1, Symbol.Type.METHOD));
 							childGetter.addChild(new Constant("this"));