Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rf0c16ca7223ad48b7bdb86b8f010b74b550c0051 -r647eb56990d69caaed6442fcaf4ba9ae4461cd00
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision f0c16ca7223ad48b7bdb86b8f010b74b550c0051)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 647eb56990d69caaed6442fcaf4ba9ae4461cd00)
@@ -139,7 +139,6 @@
     HD_OP_MODE_T newMode;
     U32 priorSubMode = currentSubMode;
     U32 priorSubState = currentSubState;
-    U32 priorOpMode = (U32)currentMode;
     U32 prior4thLevelState = current4thLevelState;
 
     // Any new mode requests?
@@ -220,8 +219,7 @@
     }   // End switch
 
     // Send operation status event when appropriate
-    if ( priorOpMode != currentMode || priorSubMode != currentSubMode ||
-         priorSubState != currentSubState || prior4thLevelState != current4thLevelState )
+    if ( ( priorSubMode != currentSubMode ) || ( priorSubState != currentSubState ) || ( prior4thLevelState != current4thLevelState ) )
     {
         sendOperationStatusEvent();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )