Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rd7926685f2fe3086bab183166119f0965a192a69 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision d7926685f2fe3086bab183166119f0965a192a69)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -113,12 +113,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 );