Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r7665e7b142961a50c5e77c44877247366a374526 -rdaefaef0d2d3e13ff563f11d9721ccc1d831cf06
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 7665e7b142961a50c5e77c44877247366a374526)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision daefaef0d2d3e13ff563f11d9721ccc1d831cf06)
@@ -1274,10 +1274,10 @@
     HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
     // Retrieve blood flow sensor calibration data and check for sensor connected status
-    if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
+    if ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() )
     {
-        bloodFlowCalGain = cal.hdFlowSensors.gain;
-        bloodFlowCalOffset = cal.hdFlowSensors.offset;
+        bloodFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].gain;
+        bloodFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].offset;
         result = SELF_TEST_STATUS_PASSED;
     }