Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -re59061b28dc035b014573ed674fbf381a1c15dd0 -rb57e35bcded6968444b66e7a58dec34c3dd99082
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision e59061b28dc035b014573ed674fbf381a1c15dd0)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision b57e35bcded6968444b66e7a58dec34c3dd99082)
@@ -127,6 +127,8 @@
             break;
 
         default:
+            // Fault in fault mode is needed?
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_FAULT_INVALID_STATE, (U32)faultState )
             faultState = TD_FAULT_DEENERGIZED_STATE;
             break;
     }
@@ -166,7 +168,7 @@
             setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-            retractEjector();
+            // Not calling ejector means off
             //    stopSyringePump();
             break;
 
@@ -177,7 +179,7 @@
             setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-            retractEjector();
+            // Not calling ejector means off
             //    stopSyringePump();
             break;