Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r497dc26e76083742903525aab1490a6900e94969 -r01d37b6dbd51a2c55ba9bc565e22a222f5df1017
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 497dc26e76083742903525aab1490a6900e94969)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 01d37b6dbd51a2c55ba9bc565e22a222f5df1017)
@@ -118,12 +118,22 @@
     setValveState( VPI, VALVE_STATE_CLOSED );
     setValveState( VBF, VALVE_STATE_CLOSED );
     setValveState( VSP, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+    setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
     setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+
+#ifndef V_2_SYSTEM
+    setValveState( VRD1, VALVE_STATE_CLOSED );
+    setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
     setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
     setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
     setValveState( VRF, VALVE_STATE_R2_C_TO_NO );