diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
index 7876f84eb6807e450bc55d71fdde32bac7e590c3..478bffb40485663246243f7e5997c85f7014cb58 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
@@ -1891,11 +1891,15 @@ public class JUnitTestGenerator extends Renderer {
 				append(")");
 
 		} else if (d instanceof VariableUse) {
-			append(HELPER_FIELD + ".clone(" + getElementName(((VariableUse) d).getVariable()) + ")");
+			write(d, dataUseVariables);
+//			append(HELPER_FIELD + ".clone(" + getElementName(((VariableUse) d).getVariable()) + ")");
 
 		}
 
 		line(";");
+		if (d instanceof VariableUse) {
+			lineComment("TODO " + HELPER_FIELD + ".clone(" + getElementName(((VariableUse) d).getVariable()) + ")");
+		}
 
 		if (!arguments.isEmpty()) {
 			for (ParameterBinding arg : arguments) {