Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r174197d53ce0d602350536bbe15fef807ddb0a6d -r32b198b922f305a1838fe10e42d5dc83325f0180
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 174197d53ce0d602350536bbe15fef807ddb0a6d)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 32b198b922f305a1838fe10e42d5dc83325f0180)
@@ -24,6 +24,7 @@
 #include "OperationModes.h"
 #include "RinsePump.h"
 #include "SafetyShutdown.h"
+#include "SubstitutionPump.h"
 #include "Utilities.h"
 #include "Valves.h"
 
@@ -193,12 +194,12 @@
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D80_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D81_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D83_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D85_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D88_79_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D91_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D95_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D81_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D83_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D85_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D88_79_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D91_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D95_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D100_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize Balancing chamber and Ultrafiltration valves
@@ -212,7 +213,7 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
-    signalDialysatePumpHardStop( D92_PUMP );
+    requestSubstitutionPumpOff( D92_PUMP );
     setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
@@ -251,6 +252,14 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D80_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D81_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D83_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D85_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D88_79_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D91_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D95_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D100_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize portion of balancing chamber valves.
     setValveStateDelayed( D19_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
@@ -263,9 +272,11 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
+    requestSubstitutionPumpOff( D92_PUMP );
     setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
+    stopHeater( D108_HEAT );
 }
 
 /*********************************************************************//**