Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0b800d3abb747d0f1f3dc8f67777efb9631c18e0 -r57eb6d533a74a212c81cec2baa5246399ffd8cb1
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0b800d3abb747d0f1f3dc8f67777efb9631c18e0)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 57eb6d533a74a212c81cec2baa5246399ffd8cb1)
@@ -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 );
 }