Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -rbaf0bd4f8f1b6c76bfefe7f4aec53bef6b2450cb -r63ce18f68e8381921ceed2b51b030031ed0087e9
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision baf0bd4f8f1b6c76bfefe7f4aec53bef6b2450cb)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 63ce18f68e8381921ceed2b51b030031ed0087e9)
@@ -278,6 +278,13 @@
                 self.demoCount = 0
                 self.demoCounter = 1
 
+            if msg_id == MsgIds.MSG_ID_UI_SERVICE_MODE_REQUEST:               # 0xB0
+                rsp_id = MsgIds.MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST
+                rsp_payload = integer_to_bytearray(EResponse.Accepted)
+                rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value)
+                self.demoCount = 0
+                self.demoCounter = 1
+
             # RESET/JUMP FORWARD DIALOG HANDLER -------------------------------
             if (msg_id == MsgIds.MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE.value) and \
                (params.data_int[0] == 99) and \
@@ -328,12 +335,6 @@
                 self.demoCount = 0
                 self.demoCounter = 0
 
-            elif msg_id == MsgIds.MSG_ID_UI_SERVICE_MODE_REQUEST:               # 0xB0
-                rsp_id = MsgIds.MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST
-                rsp_payload = integer_to_bytearray(EResponse.Accepted)
-                rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value)
-                self.demoCount = 0  # immediately
-
             # INITIATE A NEW TREATMENT SETUP ----------------------------------
             elif msg_id == MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value:
                 rsp_id = MsgIds.MSG_ID_HD_OP_MODE_DATA