diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index 1adf05b2..f380a60c 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -466,11 +466,10 @@ ReturnValue_t StarTrackerHandler::buildCommandFromCommand(DeviceCommandId_t devi
       return returnvalue::OK;
     }
     case (startracker::SET_TIME_FROM_SYS_TIME): {
-      // Might be buggy, need more answers from arcsec...
       SetTimeActionRequest setTimeRequest{};
       timeval tv;
       Clock::getClock(&tv);
-      setTimeRequest.unixTime = (tv.tv_sec * 1000000) + (tv.tv_usec);
+      setTimeRequest.unixTime = (static_cast<uint64_t>(tv.tv_sec) * 1000 * 1000) + (static_cast<uint64_t>(tv.tv_usec));
       arc_pack_settime_action_req(&setTimeRequest, commandBuffer, &rawPacketLen);
       size_t serLen = 0;
       // Time in milliseconds. Manual serialization because arcsec API ignores endianness.
diff --git a/tmtc b/tmtc
index 1f2f2aac..62bd5356 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 1f2f2aac13b0b32c22f0a75e557743ad32f7dc70
+Subproject commit 62bd5356220bab1ce9f3ddaa7aaf75963b8bd596