diff --git a/net_io.c b/net_io.c
index d4b3738..3c5f2ca 100644
--- a/net_io.c
+++ b/net_io.c
@@ -883,13 +883,6 @@ static void modesSendStratuxOutput(struct modesMessage *mm, struct aircraft *a)
     time_t received = (time_t) (mm->sysTimestampMsg / 1000);
     localtime_r(&received, &stTime_receive);
 
-    // Time message received (based on system clock). Format is 2016-02-20T06:35:43.155Z
-    p += sprintf(p, "\"Timestamp\":\"%04d-%02d-%02dT%02d:%02d:%02d.%03dZ\"",
-            (stTime_receive.tm_year+1900),(stTime_receive.tm_mon+1),
-            stTime_receive.tm_mday, stTime_receive.tm_hour,
-            stTime_receive.tm_min, stTime_receive.tm_sec,
-            (unsigned)(mm->sysTimestampMsg % 1000));
-
     //// callsign
     if (mm->callsign_valid)
         p += sprintf(p, "\"Tail\":\"%s\",", mm->callsign);
@@ -1013,6 +1006,13 @@ static void modesSendStratuxOutput(struct modesMessage *mm, struct aircraft *a)
     else
         p += sprintf(p, "\"Emitter_category\":null,");
 
+    // Time message received (based on system clock). Format is 2016-02-20T06:35:43.155Z
+    p += sprintf(p, "\"Timestamp\":\"%04d-%02d-%02dT%02d:%02d:%02d.%03dZ\"",
+            (stTime_receive.tm_year+1900),(stTime_receive.tm_mon+1),
+            stTime_receive.tm_mday, stTime_receive.tm_hour,
+            stTime_receive.tm_min, stTime_receive.tm_sec,
+            (unsigned)(mm->sysTimestampMsg % 1000));
+
     p += sprintf(p, "}\r\n");
 
     completeWrite(&Modes.stratux_out, p);