Index: sources/StateController.cpp
===================================================================
diff -u -r747a110945a7aa9b45c03107a5b1a7c9c220c71f -r4962db1d199fff532618c755301e089c99399c53
--- sources/StateController.cpp	(.../StateController.cpp)	(revision 747a110945a7aa9b45c03107a5b1a7c9c220c71f)
+++ sources/StateController.cpp	(.../StateController.cpp)	(revision 4962db1d199fff532618c755301e089c99399c53)
@@ -187,19 +187,19 @@
                 _currentCounterValue = _dryDemoCmds[_dryDemoCurrentCmd][_index][COUNT_DOWN_TIMER_INDEX].toUInt();
             }
 
-            if(_timerBroadcastCount >= NUM_OF_COUNTS_TIMER_BC_EMIT) {
+            if (_timerBroadcastCount >= NUM_OF_COUNTS_TIMER_BC_EMIT) {
                 _currentCounterValue--;
                 _timerBroadcastCount = 0;
 
                 QVariant tempVar = _dryDemoCmds[_dryDemoCurrentCmd][_index].mid(RESP_MSG_START_INDEX);
                 QVariantList msg = tempVar.toList();
-                msg[3] = _currentCounterValue;
+                msg[COUNT_DOWN_TIMER_INDEX - RESP_MSG_START_INDEX] = _currentCounterValue;
                 qDebug() << "Counters" << msg << _currentCounterValue << _dryDemoCmds[_dryDemoCurrentCmd][_index][COUNT_DOWN_TIMER_INDEX].toUInt();
                 emit _ApplicationController.didActionTransmit(msg);
 
                 if (_currentCounterValue == 0) {
                     _index++;
-                    _currentCounterValue = -1;
+                    _currentCounterValue = COUNTER_VAR_DEFAULT_VALUE;
                 }
             }
             else {
@@ -833,7 +833,7 @@
     _broadcastMsgCount         = 0;
     _timerBroadcastCount       = 0;
     _hasUserConfirmedToProceed = false;
-    _currentCounterValue       = -1;
+    _currentCounterValue       = COUNTER_VAR_DEFAULT_VALUE;
 }
 
 // ----------- State transition methods ---------------- //