diff --git a/src/comm/MAVLinkSimulationLink.cc b/src/comm/MAVLinkSimulationLink.cc
index 9239b431b4974762f0cf221b1a17316abe1adbcd..204b33d08cec4b05f32c9f5940060f7d02ace025 100644
--- a/src/comm/MAVLinkSimulationLink.cc
+++ b/src/comm/MAVLinkSimulationLink.cc
@@ -76,7 +76,7 @@ MAVLinkSimulationLink::MAVLinkSimulationLink(QString readFile, QString writeFile
         simulationHeader = simulationFile->readLine();
     }
     receiveFile = new QFile(writeFile, this);
-    lastSent = MG::TIME::getGroundTimeNow();
+    lastSent = MG::TIME::getGroundTimeNow() * 1000;
 
     if (simulationFile->exists())
     {
@@ -218,6 +218,8 @@ void MAVLinkSimulationLink::mainloop()
             static quint64 lastTime = 0;
             static quint64 baseTime = 0;
             quint64 time = QString(parts.first()).toLongLong(&ok, 10);
+	    // FIXME Remove multiplicaton by 1000
+	    time *= 1000;
 
             if (ok)
             {