diff --git a/src/main/java/tmltranslator/TMLForLoop.java b/src/main/java/tmltranslator/TMLForLoop.java
index 83e13513385d937033e6acdf1126e13ba068f07f..ad71352cd795118c15875b237dafae3dfa850920 100755
--- a/src/main/java/tmltranslator/TMLForLoop.java
+++ b/src/main/java/tmltranslator/TMLForLoop.java
@@ -41,6 +41,7 @@
 
 package tmltranslator;
 
+import myutil.*;
 
 /**
  * Class TMLForLoop
@@ -77,7 +78,7 @@ public class TMLForLoop extends TMLActivityElement {
     }
 
     public String customExtraToXML() {
-	return " init=\"" + init + "\" + condition=\"" + condition + "\" increment=\"" + increment + "\" isInfinite=\"" + isInfinite + "\" ";
+	return " init=\"" + Conversion.transformToXMLString(init) + "\" condition=\"" + Conversion.transformToXMLString(condition) + "\" increment=\"" + Conversion.transformToXMLString(increment) + "\" isInfinite=\"" + isInfinite + "\" ";
     }
     
  
diff --git a/src/main/java/tmltranslator/TMLMapping.java b/src/main/java/tmltranslator/TMLMapping.java
index bc96d333ebd11fe336f0d1f1460ff751dddaf2a5..64e439611784efd6a60b7df3330949abc38fefb4 100755
--- a/src/main/java/tmltranslator/TMLMapping.java
+++ b/src/main/java/tmltranslator/TMLMapping.java
@@ -43,7 +43,7 @@
 
 package tmltranslator;
 
-import myutil.TraceManager;
+import myutil.*;
 import tmltranslator.toproverif.TML2ProVerif;
 import ui.TMLArchiPanel;
 import ui.TMLComponentDesignPanel;
@@ -1487,9 +1487,10 @@ public class TMLMapping<E> {
 	for(int i=0; i<onnodes.size(); i++) {
 	    HwExecutionNode node = onnodes.get(i);
 	    TMLTask task = mappedtasks.get(i);
-	    s += "<TASKMAP node=\"" + node.getName() + "\" task=\"" + task.getName() + " />\n";
+	    s += "<TASKMAP node=\"" + node.getName() + "\" task=\"" + task.getName() + "\" />\n";
 	}
 	s += "</TMLMAPPING>\n";
+	//s = myutil.Conversion.transformToXMLString(s);
 	return s;
     }
 }