Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -re9f15ff59ac0350adcbe544df8b3451e15ee7287 -r026197c08dc426a0a79c9a958d20578d52a9fee3
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision e9f15ff59ac0350adcbe544df8b3451e15ee7287)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 026197c08dc426a0a79c9a958d20578d52a9fee3)
@@ -482,17 +482,14 @@
                 if ( CONFIRMATION_REQUEST_STATUS_TIMEOUT == status )
                 {
                     cmd.requestType = GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE;
-                    sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST,
-                                 COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd,
-                                 sizeof( GENERIC_CONFIRMATION_REQUEST_T ) );
                 }
                 else
                 {
                     cmd.requestType = GENERIC_CONFIRM_CMD_ACCEPT_CLOSE;
-                    sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST,
-                                 COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd,
-                                 sizeof( GENERIC_CONFIRMATION_REQUEST_T ) );
                 }
+                sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST,
+                             COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd,
+                             sizeof( GENERIC_CONFIRMATION_REQUEST_T ) );
 
                 // Clear the confirmation request, it is done and consumed
                 confirmRequests[ i ].requestID = GENERIC_CONFIRM_ID_NONE;
@@ -587,7 +584,7 @@
         // Find an unused slot
         for ( i = 0; i < MAX_PENDING_CONFIRM_REQUESTS; i++ )
         {
-            if ( CONFIRMATION_REQUEST_STATUS_UNUSED == confirmRequests[i].status )
+            if ( CONFIRMATION_REQUEST_STATUS_UNUSED == confirmRequests[ i ].status )
             {
                 confirmRequests[ i ].requestID = requestID;
                 confirmRequests[ i ].requestType = requestType;