Index: firmware/App/Controllers/FlowSensors.c
===================================================================
diff -u -r44f739bf3e9dfe0bfb5910a6a32fc4c5b1533af3 -r696e732c9742535a58b9c65f243df7cd797d1423
--- firmware/App/Controllers/FlowSensors.c	(.../FlowSensors.c)	(revision 44f739bf3e9dfe0bfb5910a6a32fc4c5b1533af3)
+++ firmware/App/Controllers/FlowSensors.c	(.../FlowSensors.c)	(revision 696e732c9742535a58b9c65f243df7cd797d1423)
@@ -319,12 +319,15 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( sensorId < NUM_OF_FLOW_SENSORS )
     {
-        flowSensorStatus[ sensorId ].measuredFlowLPM.ovInitData = flowSensorStatus[ sensorId ].measuredFlowLPM.data;
-        flowSensorStatus[ sensorId ].measuredFlowLPM.ovData     = flowLPM;
-        flowSensorStatus[ sensorId ].measuredFlowLPM.override   = OVERRIDE_KEY;
-        result                                                  = TRUE;
+        if ( TRUE == isTestingActivated() )
+        {
+            flowSensorStatus[ sensorId ].measuredFlowLPM.ovInitData = flowSensorStatus[ sensorId ].measuredFlowLPM.data;
+            flowSensorStatus[ sensorId ].measuredFlowLPM.ovData     = flowLPM;
+            flowSensorStatus[ sensorId ].measuredFlowLPM.override   = OVERRIDE_KEY;
+            result                                                  = TRUE;
+        }
     }
 
     return result;
@@ -343,13 +346,16 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( sensorId < NUM_OF_FLOW_SENSORS )
     {
-        flowSensorStatus[ sensorId ].measuredFlowLPM.data       = flowSensorStatus[ sensorId ].measuredFlowLPM.ovInitData;
-        flowSensorStatus[ sensorId ].measuredFlowLPM.override   = OVERRIDE_RESET;
-        flowSensorStatus[ sensorId ].measuredFlowLPM.ovInitData = 0.0;
-        flowSensorStatus[ sensorId ].measuredFlowLPM.ovData     = 0.0;
-        result                                                  = TRUE;
+        if ( TRUE == isTestingActivated() )
+        {
+            flowSensorStatus[ sensorId ].measuredFlowLPM.data       = flowSensorStatus[ sensorId ].measuredFlowLPM.ovInitData;
+            flowSensorStatus[ sensorId ].measuredFlowLPM.override   = OVERRIDE_RESET;
+            flowSensorStatus[ sensorId ].measuredFlowLPM.ovInitData = 0.0F;
+            flowSensorStatus[ sensorId ].measuredFlowLPM.ovData     = 0.0F;
+            result                                                  = TRUE;
+        }
     }
 
     return result;