Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r85b43b31e65b2820237d864bd5e67feca03b98ee -r9907b4602e00e40a84ff55344d61cee50feebc36
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 85b43b31e65b2820237d864bd5e67feca03b98ee)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 9907b4602e00e40a84ff55344d61cee50feebc36)
@@ -410,14 +410,11 @@
  *************************************************************************/
 void signalBloodPumpHardStop( void )
 {
-    bloodPumpControlMode = PUMP_CONTROL_MODE_OPEN_LOOP;
-    bloodPumpDirection = MOTOR_DIR_FORWARD;
-    bloodPumpPWMDutyCyclePct = BP_PWM_ZERO_OFFSET;
-    bloodPumpState = BLOOD_PUMP_OFF_STATE;
-    bpControlTimerCounter = 0;
     targetBloodFlowRate = 0;
-    resetBloodPumpRPMMovingAverage();
     stopBloodPump();
+    bloodPumpState = BLOOD_PUMP_OFF_STATE;
+    bloodPumpPWMDutyCyclePct = BP_PWM_ZERO_OFFSET;
+    bpControlTimerCounter = 0;
     resetPIController( PI_CONTROLLER_ID_BLOOD_FLOW, MIN_BLOOD_PUMP_PWM_DUTY_CYCLE );
 }