diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index 0d8b08f..9984ce0 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -312,7 +312,7 @@
 						}
 						composer = new Term(DataConstraintModel.insert);
 						composer.addChild(composerSub);
-						composer.addChild(new Constant(fieldName, DataConstraintModel.typeString));		// key
+						composer.addChild(new Constant(langSpec.getStringDelimiter() + fieldName + langSpec.getStringDelimiter(), DataConstraintModel.typeString));		// key
 						composer.addChild(childGetter);													// value
 						composer.setType(DataConstraintModel.typeMap);
 						composerSub = composer;
@@ -320,8 +320,11 @@
 					composer.setType(stateGetter.getReturnType());
 					String[] sideEffects = new String[] {null};
 					String returnValue = composer.toImplementation(sideEffects);
-					if (sideEffects[0] != null) stateGetter.addStatement(sideEffects[0]);
-					stateGetter.addStatement(langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
+					if (sideEffects[0] != null) {
+						stateGetter.addStatement(sideEffects[0] + langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
+					} else {
+						stateGetter.addStatement(langSpec.getReturnStatement(returnValue) + langSpec.getStatementDelimiter());
+					}
 				}
 			}
 		}