Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r7a7bf19d0cf16745566956f45cef57f8eb5df445 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -168,9 +168,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