Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r9feea867113c62088f0ce91750127972dbd9bf53
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
@@ -166,9 +166,9 @@
             break;
 
         default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
             currentMode = MODE_FAUL;
             currentSubMode = 0;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
             break;
     }   // End switch