diff --git a/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java b/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java
index e8dd7709dbfafcaabb5e28b60fc5b7d1b4e7fd80..101a1712164356f0d434caa7f1e94b0de27db3b9 100644
--- a/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java
+++ b/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java
@@ -172,7 +172,7 @@ public class TaskNetworkInterfaceOUT extends TMLTask {
             TMLSendEvent sendEvtFeedback = new TMLSendEvent("sendEvtFeedback_VC" + i, referenceObject);
             sendEvtFeedback.setEvent(outputFeedbackEvents.get(i));
             addElement(testingVC, sendEvtFeedback);
-            testingEOP.addGuard("vc == " + i);
+            testingVC.addGuard("vc == " + i);
 
             TMLStopState stopVC = new TMLStopState("stopVC" + i, referenceObject);
             addElement(sendEvtFeedback, stopVC);
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index d1837a9b2bc5939919f94ec0de703ea60bde39f5..7ce18a7625899d2a4a51314c3de0ead7d0b5de73 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -3715,10 +3715,19 @@ public class GTURTLEModeling {
         return str;
     }
 
+
+    private String header() {
+        String head = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<TURTLEGMODELING version=\"" + DefaultText.getVersion() + "\"";
+        //head += ModelParameter.toXML();
+        head += ">\n\n";
+        return head;
+
+    }
+
     public String makeOneDiagramXMLFromGraphicalModel(TURTLEPanel tp, int indexOfDiagram) {
         StringBuffer sb = new StringBuffer();
         //sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<TURTLEGMODELING>\n\n");
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<TURTLEGMODELING version=\"" + DefaultText.getVersion() + "\">\n\n");
+        sb.append(header());
 
         StringBuffer s;
         String str;
@@ -3745,7 +3754,7 @@ public class GTURTLEModeling {
     public String makeXMLFromTurtleModeling(int index, String extensionToName) {
         StringBuffer sb = new StringBuffer();
         //sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<TURTLEGMODELING>\n\n");
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<TURTLEGMODELING version=\"" + DefaultText.getVersion() + "\">\n\n");
+        sb.append(header());
 
         StringBuffer s;
         String str;
@@ -5439,7 +5448,7 @@ public class GTURTLEModeling {
             return null;
         }
 
-        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<TURTLEGMODELING version=\"" + DefaultText.getVersion() + "\">\n\n");
+        sb.append(header());
 
         if (index2 > -1) {
             sb.append("<Modeling type=\"Analysis\" nameTab=\"Analysis\" >\n");