Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r9508f34690d1de8bd091fd2e094578ce280a0f9e -rbb87f31d2e7bfa8708d359f61b675c2b938d78ad
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9508f34690d1de8bd091fd2e094578ce280a0f9e)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision bb87f31d2e7bfa8708d359f61b675c2b938d78ad)
@@ -169,6 +169,7 @@
         lastMode = currentMode;
         transitionToNewOperationMode( newMode );
         currentMode = newMode;
+        sendOperationStatusEvent();
     }
 
     // mode specific processing to be done continuously
@@ -402,8 +403,6 @@
     {
         SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
     }
-
-    sendOperationStatusEvent();
 }
 
 /*********************************************************************//**
@@ -473,7 +472,6 @@
  *************************************************************************/
 static void sendOperationStatusEvent()
 {
-
     EVENT_DATA_T dat1;
     EVENT_DATA_T dat2;
     U32 opData = ( (U08)currentMode +