diff --git a/mode_s.c b/mode_s.c
index 617c410..090aff6 100644
--- a/mode_s.c
+++ b/mode_s.c
@@ -49,6 +49,10 @@
 
 
 #include "dump1090.h"
+
+/* for PRIX64 */
+#include <inttypes.h>
+
 //
 // ===================== Mode S detection and decoding  ===================
 //
@@ -1058,7 +1062,6 @@ static void displayCommB(struct modesMessage *mm)
 
 void displayModesMessage(struct modesMessage *mm) {
     int j;
-    unsigned char * pTimeStamp;
 
     // Handle only addresses mode first.
     if (Modes.onlyaddr) {
@@ -1068,11 +1071,7 @@ void displayModesMessage(struct modesMessage *mm) {
 
     // Show the raw message.
     if (Modes.mlat && mm->timestampMsg) {
-        printf("@");
-        pTimeStamp = (unsigned char *) &mm->timestampMsg;
-        for (j=5; j>=0;j--) {
-            printf("%02X",pTimeStamp[j]);
-        } 
+        printf("@%012" PRIX64, mm->timestampMsg);
     } else
         printf("*");