diff --git a/simulators/c++2/src_simulator/app/TMLEventBChannel.h b/simulators/c++2/src_simulator/app/TMLEventBChannel.h
index d86ee4a937602b08429dfabf1f571893cae82308..419bee6243be97b9e5a0cee5f56879938a550be0 100644
--- a/simulators/c++2/src_simulator/app/TMLEventBChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventBChannel.h
@@ -232,11 +232,10 @@ public:
 	}
 
 	TMLLength removeSamples(TMLLength iNbOfSamples) {
-		TMLLength aNbToRemove;
+		TMLLength aNbToRemove = 0;
 		if (iNbOfSamples==0) {
 			this->_content=0;
 			this->_paramQueue.clear();
-			aNbToRemove=0;
 		} else if (this->_content > 0) {
 			aNbToRemove=1;
 			this->_content-=aNbToRemove;
diff --git a/simulators/c++2/src_simulator/app/TMLEventFBChannel.h b/simulators/c++2/src_simulator/app/TMLEventFBChannel.h
index b932ba556e696acc15bc97c78a93fc32822bf020..d9e3671c091d4f652a7aaedf9441c06c3c62dbee 100644
--- a/simulators/c++2/src_simulator/app/TMLEventFBChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventFBChannel.h
@@ -161,11 +161,10 @@ public:
 	}
 
 	TMLLength insertSamples(TMLLength iNbOfSamples, Parameter* iParam){
-		TMLLength aNbToInsert;
+		TMLLength aNbToInsert = 0;
 		if (iNbOfSamples==0){
 			this->_content=0;
 			this->_paramQueue.clear();
-			aNbToInsert=0;
 		}else if(_length-this->_content>0) {
 			aNbToInsert=1;
 			this->_content+=aNbToInsert;
@@ -177,11 +176,10 @@ public:
 	}
 	
 	TMLLength removeSamples(TMLLength iNbOfSamples) {
-		TMLLength aNbToRemove;
+		TMLLength aNbToRemove = 0;
 		if (iNbOfSamples==0) {
 			this->_content=0;
 			this->_paramQueue.clear();
-			aNbToRemove=0;
 		} else if (this->_content>0) {
 			aNbToRemove=1;
 			this->_content-=aNbToRemove;
diff --git a/simulators/c++2/src_simulator/app/TMLEventFChannel.h b/simulators/c++2/src_simulator/app/TMLEventFChannel.h
index 7b300b79e941e0339311e1781a5b880f7fbfe842..5e623a2f4ceee2c6c07ce514b61607a7b27eb999 100644
--- a/simulators/c++2/src_simulator/app/TMLEventFChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventFChannel.h
@@ -155,11 +155,10 @@ public:
 	}
 
 	TMLLength insertSamples(TMLLength iNbOfSamples, Parameter* iParam){
-		TMLLength aNbToInsert;
+		TMLLength aNbToInsert = 0;
 		if (iNbOfSamples==0){
 			this->_content=0;
 			this->_paramQueue.clear();
-			aNbToInsert=0;
 		} else if (_length-this->_content>0) {
 			aNbToInsert=1;
 			this->_content+=aNbToInsert;
@@ -170,11 +169,10 @@ public:
 	}
 
 	TMLLength removeSamples(TMLLength iNbOfSamples) {
-		TMLLength aNbToRemove;
+		TMLLength aNbToRemove = 0;
 		if (iNbOfSamples==0) {
 			this->_content=0;
 			this->_paramQueue.clear();
-			aNbToRemove=0;
 		} else if (this->_content>0) {
 			aNbToRemove=1;
 			this->_content-=aNbToRemove;