Index: firmware/App/Controllers/DialysateFlow.c
===================================================================
diff -u -r0803f828b81e046166457564650acf6a9bbd3cc6 -rbb7a4629cc96d96b6d1749c924e77886e0d64bcb
--- firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision 0803f828b81e046166457564650acf6a9bbd3cc6)
+++ firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision bb7a4629cc96d96b6d1749c924e77886e0d64bcb)
@@ -89,10 +89,9 @@
 SELF_TEST_STATUS_T execDialysateFlowMeterSelfTest( void )
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+    BOOL calStatus            = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
+                                                    NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
 
-    BOOL calStatus = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
-                                         NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
-
     if ( TRUE == calStatus )
     {
         result = SELF_TEST_STATUS_PASSED;