diff --git a/config/OBSW_Config.py b/config/OBSW_Config.py
index 9803577ee2a3644e85045ada6fb723607ff32061..8de036d322454362e52520c5cdb7ee4b22590a68 100644
--- a/config/OBSW_Config.py
+++ b/config/OBSW_Config.py
@@ -47,7 +47,7 @@ displayMode = "long"
 comIF = 0
 # COM Port for serial communication
 comPort = 'COM0'
-serialTimeout = 0.003
+serialTimeout = 0.01
 # Time related
 tmTimeout = 10
 tcSendTimeoutFactor = 2.0
diff --git a/sendreceive/OBSW_TmListener.py b/sendreceive/OBSW_TmListener.py
index 7b377432254f8b23b49569bff9598989c1db52a8..865dd656683c7b0036b3bf46d6167bdb2bd9194d 100644
--- a/sendreceive/OBSW_TmListener.py
+++ b/sendreceive/OBSW_TmListener.py
@@ -77,6 +77,8 @@ class TmListener:
         elif self.modeId == g.modeList[2]:
             # Listen for one reply sequence.
             if self.checkForOneTelemetrySequence():
+                # Set reply event, will be cleared by checkForFirstReply()
+                self.replyEvent.set()
                 print("All replies received!")
                 self.replyEvent.set()
         # Sequential Command Mode
diff --git a/tc/OBSW_TcPacker.py b/tc/OBSW_TcPacker.py
index 609313a5a1338c97bbeb9d4b891b2aaf8c3d6c8c..e7f10a492bc6c5e41e714bb442567136b97957ce 100644
--- a/tc/OBSW_TcPacker.py
+++ b/tc/OBSW_TcPacker.py
@@ -211,6 +211,6 @@ def createTotalTcQueue():
     tcQueue = packService17TestInto(tcQueue)
     tcQueue = packService200TestInto(tcQueue)
     tcQueue = packDummyDeviceTestInto(tcQueue)
-    objectId = bytearray([0x44, 0x00, 0x1F, 0x00])
-    tcQueue = packGpsTestInto(objectId, tcQueue)
+    # objectId = bytearray([0x44, 0x00, 0x1F, 0x00])
+    # tcQueue = packGpsTestInto(objectId, tcQueue)
     return tcQueue