Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -reda59c3b44a87b7dca0991b45d60cfe3f3601b27 -rdaefaef0d2d3e13ff563f11d9721ccc1d831cf06
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision eda59c3b44a87b7dca0991b45d60cfe3f3601b27)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision daefaef0d2d3e13ff563f11d9721ccc1d831cf06)
@@ -1232,10 +1232,10 @@
     HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
     // Retrieve dialysate flow sensor calibration data
-    if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() ) )
+    if (  DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() )
     {
-        dialInFlowCalGain = cal.hdFlowSensors.gain;
-        dialInFlowCalOffset = cal.hdFlowSensors.offset;
+        dialInFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].gain;
+        dialInFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].offset;
         result = SELF_TEST_STATUS_PASSED;
     }