diff --git a/simulators/c++2/src_simulator/app/Parameter.h b/simulators/c++2/src_simulator/app/Parameter.h
index f96df82e5d0dd95089d4a2e491bb78625fe255ab..e3c05b934367cfc238abb64d29fa791ce58b0932 100644
--- a/simulators/c++2/src_simulator/app/Parameter.h
+++ b/simulators/c++2/src_simulator/app/Parameter.h
@@ -84,11 +84,12 @@ public:
 //#endif
 	}
 			
-	SizedParameter(std::istream& s){
-//#if size>0
-		for (unsigned int i=0;i<size;i++){
-			READ_STREAM(s, _p[i]);
-		}
+  SizedParameter(std::istream& s){
+    //#if size>0
+    for (unsigned int i=0;i<size;){
+      READ_STREAM(s, _p[i]);
+      i++;
+    }
 #ifdef DEBUG_SERIALIZE
 		print();
 #endif
diff --git a/ttool/src/test/java/tmltranslator/TMLDeepCloneTests.java b/ttool/src/test/java/tmltranslator/TMLDeepCloneTests.java
index e19b1102125bdca5b2da27f72a6d650ecd0851e8..11a8b9475a0458fe05df03395dfc844dc152426e 100644
--- a/ttool/src/test/java/tmltranslator/TMLDeepCloneTests.java
+++ b/ttool/src/test/java/tmltranslator/TMLDeepCloneTests.java
@@ -25,7 +25,7 @@ public class TMLDeepCloneTests extends AbstractTest {
 
 
     // Test true cases
-    @Test
+    @Test @SuppressWarnings("unchecked")
     public void testDeepCloneTMLApplication() {
         for(String fileName: TML_APP_FILES) {
             fileName = getBaseResourcesDir() + PATH_TO_TEST_CLONE_FILE + fileName;
@@ -68,6 +68,7 @@ public class TMLDeepCloneTests extends AbstractTest {
                 assertTrue(false);
             }
 
+
             tmltsw = new TMLTextSpecification("cloned");
             outputTML = tmltsw.toTextFormat(cloned);