Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r285b5d82539c96524c93703d52a66fff76fb64fc -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 285b5d82539c96524c93703d52a66fff76fb64fc)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -736,13 +736,8 @@
  *************************************************************************/
 F32 getMeasuredBloodFlowRate( void )
 {
-    F32 result = measuredBloodFlowRate.data;
+    F32 result = getF32OverrideValue( &measuredBloodFlowRate );
 
-    if ( OVERRIDE_KEY == measuredBloodFlowRate.override )
-    {
-        result = measuredBloodFlowRate.ovData;
-    }
-
     return result;
 }
 
@@ -756,13 +751,8 @@
  *************************************************************************/
 F32 getMeasuredBloodPumpRotorSpeed( void )
 {
-    F32 result = bloodPumpRotorSpeedRPM.data;
+    F32 result = getF32OverrideValue( &bloodPumpRotorSpeedRPM );
 
-    if ( OVERRIDE_KEY == bloodPumpRotorSpeedRPM.override )
-    {
-        result = bloodPumpRotorSpeedRPM.ovData;
-    }
-
     return result;
 }
 
@@ -776,13 +766,8 @@
  *************************************************************************/
 F32 getMeasuredBloodPumpSpeed( void )
 {
-    F32 result = bloodPumpSpeedRPM.data;
+    F32 result = getF32OverrideValue( &bloodPumpSpeedRPM );
 
-    if ( OVERRIDE_KEY == bloodPumpSpeedRPM.override )
-    {
-        result = bloodPumpSpeedRPM.ovData;
-    }
-
     return result;
 }