diff --git a/connections/canconmanager.cpp b/connections/canconmanager.cpp
index d0f2053..f31e70a 100644
--- a/connections/canconmanager.cpp
+++ b/connections/canconmanager.cpp
@@ -222,8 +222,7 @@ bool CANConManager::sendFrame(const CANFrame& pFrame)
             workingFrame.isReceived = false;
             if (useSystemTime)
             {
-                qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch();
-                workingFrame.setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000));
+                workingFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
             }
             else
             {
diff --git a/connections/gvretserial.cpp b/connections/gvretserial.cpp
index 77eeaba..1b3dbc7 100644
--- a/connections/gvretserial.cpp
+++ b/connections/gvretserial.cpp
@@ -685,8 +685,7 @@ void GVRetSerial::procRXChar(unsigned char c)
             buildTimestamp += timeBasis;
             if (useSystemTime)
             {
-                buildTimestamp = QDateTime::currentMSecsSinceEpoch();
-                buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(buildTimestamp / 1000, (buildTimestamp % 1000) * 1000));
+                buildFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
             } else {
                 buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
             }
@@ -772,9 +771,10 @@ void GVRetSerial::procRXChar(unsigned char c)
             buildTimestamp += timeBasis;
             if (useSystemTime)
             {
-                buildTimestamp = QDateTime::currentMSecsSinceEpoch() * 1000l;
+                buildFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
+            } else {
+                buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
             }
-            buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, buildTimestamp));
             break;
         case 4:
             buildId = c;
diff --git a/connections/lawicel_serial.cpp b/connections/lawicel_serial.cpp
index fd409bc..37a078d 100644
--- a/connections/lawicel_serial.cpp
+++ b/connections/lawicel_serial.cpp
@@ -493,8 +493,7 @@ void LAWICELSerial::readSerialData()
 
             if (useSystemTime)
             {
-                buildTimestamp = QDateTime::currentMSecsSinceEpoch();
-                buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(buildTimestamp / 1000, (buildTimestamp % 1000) * 1000));
+                buildFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
             }
             else
             {
diff --git a/connections/mqtt_bus.cpp b/connections/mqtt_bus.cpp
index a6cc0d2..86da138 100644
--- a/connections/mqtt_bus.cpp
+++ b/connections/mqtt_bus.cpp
@@ -302,8 +302,7 @@ void MQTT_BUS::clientMessageReceived(const QMQTT::Message& message)
         frame_p->isReceived = true;
         if (useSystemTime)
         {
-            qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch();
-            frame_p->setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000));
+            frame_p->setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
         }
         else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, timeStamp));
 
diff --git a/connections/serialbusconnection.cpp b/connections/serialbusconnection.cpp
index b54aa69..ad21817 100644
--- a/connections/serialbusconnection.cpp
+++ b/connections/serialbusconnection.cpp
@@ -211,8 +211,7 @@ void SerialBusConnection::framesReceived()
                 frame_p->isReceived = !recFrame.hasLocalEcho();
 
                 if (useSystemTime) {
-                    qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch();
-                    frame_p->setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000));
+                    frame_p->setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(QDateTime::currentMSecsSinceEpoch()));
                 }
                 else frame_p->setTimeStamp(QCanBusFrame::TimeStamp(0, (recFrame.timeStamp().seconds() * 1000000ul + recFrame.timeStamp().microSeconds()) - timeBasis));