Index: firmware/App/Modes/ModeUpdate.c
===================================================================
diff -u -rab214e8ea52d8433b7cee58f5aaff49fc759310d -rb887b4a2796de3b26be07619809f8f4146955867
--- firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision ab214e8ea52d8433b7cee58f5aaff49fc759310d)
+++ firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision b887b4a2796de3b26be07619809f8f4146955867)
@@ -132,11 +132,11 @@
 
     switch( dest )
     {
-        // TODO check the image in firmware and then both cases reset the bootloader.
-        // Come back and wait for the update broadcast for 3 seconds and if not, jump
         case UPDATE_FPGA:
-            if ( TRUE == isFPGAFlashComplete() )
+            if ( FALSE == isFPGASelfConfigureInProgress() )
             {
+                // Before tranistioning back to standby for the final verification, the self configure part
+                // of FPGA should be completed.
                 requestNewOperationMode( MODE_STAND );
             }
             break;