diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp
index 70dec9e94..36bd9658c 100644
--- a/src/blackcore/vatsim/networkvatlib.cpp
+++ b/src/blackcore/vatsim/networkvatlib.cpp
@@ -903,7 +903,7 @@ namespace BlackCore
 
             //! we set a dynamically updating offset time here
             situation.setCurrentUtcTime();
-            const int offsetMs = self->markReceivedPositionAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch());
+            const int offsetMs = self->receivedPositionFixTsAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch());
             situation.setTimeOffsetMs(offsetMs);
 
             CTransponder::TransponderMode mode = CTransponder::StateStandby;
@@ -979,7 +979,7 @@ namespace BlackCore
             situation.setCurrentUtcTime();
             situation.setTimeOffsetMs(c_interimPositionTimeOffsetMsec);
             situation.setInterimFlag(true);
-            self->markReceivedPositionAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch());
+            self->receivedPositionFixTsAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch());
 
             emit self->aircraftInterimPositionUpdate(situation);
         }
@@ -1184,7 +1184,7 @@ namespace BlackCore
             }
         }
 
-        int CNetworkVatlib::markReceivedPositionAndGetOffsetTime(const CCallsign &callsign, qint64 markerTs)
+        qint64 CNetworkVatlib::receivedPositionFixTsAndGetOffsetTime(const CCallsign &callsign, qint64 markerTs)
         {
             Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
 
@@ -1197,15 +1197,15 @@ namespace BlackCore
             const qint64 oldTs = m_lastPositionUpdate.value(callsign);
             m_lastPositionUpdate[callsign] = markerTs;
 
-            const int diff = oldTs - markerTs;
-            const int offsetTime = (oldTs > 0 && diff > 0 && diff < c_interimPositionTimeOffsetMsec) ?
-                                   c_interimPositionTimeOffsetMsec :
-                                   c_positionTimeOffsetMsec;
+            const qint64 diff = oldTs - markerTs;
+            const qint64 offsetTime = (oldTs > 0 && diff > 0 && diff < c_interimPositionTimeOffsetMsec) ?
+                                      c_interimPositionTimeOffsetMsec :
+                                      c_positionTimeOffsetMsec;
             m_lastOffsetTime[callsign] = offsetTime;
             return offsetTime;
         }
 
-        int CNetworkVatlib::currentOffsetTime(const CCallsign &callsign) const
+        qint64 CNetworkVatlib::currentOffsetTime(const CCallsign &callsign) const
         {
             Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
 
diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h
index 21786f816..ea504bdd4 100644
--- a/src/blackcore/vatsim/networkvatlib.h
+++ b/src/blackcore/vatsim/networkvatlib.h
@@ -134,8 +134,8 @@ namespace BlackCore
 
             //! Offset times basically telling when to expect the next value from network plus some reserve
             //! @{
-            static int constexpr c_positionTimeOffsetMsec = 6000;           //!< offset time for received position updates
-            static int constexpr c_interimPositionTimeOffsetMsec = 2000;    //!< offset time for received interim position updates
+            static qint64 constexpr c_positionTimeOffsetMsec = 6000;        //!< offset time for received position updates
+            static qint64 constexpr c_interimPositionTimeOffsetMsec = 2000; //!< offset time for received interim position updates
             //! @}
 
         private:
@@ -228,10 +228,10 @@ namespace BlackCore
             void maybeHandleAtisReply(const BlackMisc::Aviation::CCallsign &sender, const BlackMisc::Aviation::CCallsign &receiver, const QString &message);
 
             //! Remember when last position was received
-            int markReceivedPositionAndGetOffsetTime(const BlackMisc::Aviation::CCallsign &callsign, qint64 markerTs = -1);
+            qint64 receivedPositionFixTsAndGetOffsetTime(const BlackMisc::Aviation::CCallsign &callsign, qint64 markerTs = -1);
 
             //! Current offset time
-            int currentOffsetTime(const BlackMisc::Aviation::CCallsign &callsign) const;
+            qint64 currentOffsetTime(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Clear state when connection is terminated
             void clearState();