Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rc74c1d99a011dd0fb7f98f183faecda675221fce -radea34db9066bdc0dbb20f49bdf66c9331a7037c
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision c74c1d99a011dd0fb7f98f183faecda675221fce)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision adea34db9066bdc0dbb20f49bdf66c9331a7037c)
@@ -57,15 +57,16 @@
     switch ( currentMode )
     {
         case MODE_STAND:
-            execStandbyMode();
+            currentMode = (BL_OP_MODE_T)execStandbyMode();
             break;
 
         case MODE_UPDATE:
-            execUpdateMode();
+            currentMode = (BL_OP_MODE_T)execUpdateMode();
             break;
 
         default:
             // Do nothing
+            // TODO alarm?
             break;
     }
 }
@@ -102,15 +103,16 @@
     switch ( newMode )
     {
         case MODE_STAND:
-            transitionToStandbyMode();
+            currentMode = (BL_OP_MODE_T)transitionToStandbyMode();
             break;
 
         case MODE_UPDATE:
-            transitionToUpdateMode();
+            currentMode = (BL_OP_MODE_T)transitionToUpdateMode();
             break;
 
         default:
             // Do nothing for now
+            // TODO alarm?
             break;
     }
 }