Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -rf96654b60d6a3a09178dc1dfe22c54ae1e067eed
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision f96654b60d6a3a09178dc1dfe22c54ae1e067eed)
@@ -1081,6 +1081,7 @@
     {
         MOTOR_DIR_T bpMCDir, bpDir;
         BOOL isDirIncorrect;
+
         U08 dirErrorCnt = getFPGABloodPumpHallSensorStatus() & PUMP_DIR_ERROR_COUNT_MASK;
 
         // Check pump direction error count
@@ -1094,6 +1095,7 @@
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_BLOOD_PUMP )
             }
         }
+
         bpMCDir = ( getMeasuredBloodPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
         bpDir = ( getMeasuredBloodPumpSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
 
@@ -1202,11 +1204,11 @@
  *************************************************************************/
 static void checkBloodPumpMCCurrent( void )
 {
-    F32 const bpCurr =  fabs( getMeasuredBloodPumpMCCurrent() );
+    F32 const bpCurr = fabs( getMeasuredBloodPumpMCCurrent() );
     // Check blood pump current during off state
-    BOOL const isOffMCCurrentBad = ( BLOOD_PUMP_OFF_STATE == bloodPumpState ) && ( bpCurr > BP_MAX_CURR_WHEN_STOPPED_MA );
+    BOOL const isOffMCCurrentBad = ( ( BLOOD_PUMP_OFF_STATE == bloodPumpState ) && ( bpCurr > BP_MAX_CURR_WHEN_STOPPED_MA ) ? TRUE : FALSE );
     // Check blood pump current during running state
-    BOOL const isRunningMCCurrentBad = ( BLOOD_PUMP_OFF_STATE != bloodPumpState ) && ( bpCurr > BP_MAX_CURR_WHEN_RUNNING_MA );
+    BOOL const isRunningMCCurrentBad = ( ( BLOOD_PUMP_OFF_STATE != bloodPumpState ) && ( bpCurr > BP_MAX_CURR_WHEN_RUNNING_MA ) ? TRUE : FALSE );
 
     if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, isOffMCCurrentBad || isRunningMCCurrentBad ) ) )
     {