diff --git a/server/streamtiming.cpp b/server/streamtiming.cpp
index e42e764..c3d6dac 100644
--- a/server/streamtiming.cpp
+++ b/server/streamtiming.cpp
@@ -155,8 +155,8 @@ int StreamTiming::processRecords()
 
             count++;
 
-            qDebug("XXXXX [%u/%u] diff %ld.%ld (%ld.%ld - %ld.%ld)",
-                i.value().portId, i.key(),
+            qDebug("XXXXX [%u/%u/%u] diff %ld.%ld (%ld.%ld - %ld.%ld)",
+                i.value().portId, guid, i.key() & 0xFF,
                 diff.tv_sec, diff.tv_nsec,
                 rxTime.tv_sec, rxTime.tv_nsec,
                 txTime.tv_sec, txTime.tv_nsec);
diff --git a/server/streamtiming.h b/server/streamtiming.h
index 3a782aa..447f9b1 100644
--- a/server/streamtiming.h
+++ b/server/streamtiming.h
@@ -54,7 +54,7 @@ private:
     int deleteStaleRecords();
 
     quint32 makeKey(uint guid, uint ttagId) {
-        return guid << 24 | (ttagId & 0xFF);
+        return guid << 8 | (ttagId & 0xFF);
     }
 
     // XXX: use only time intervals, not absolute time
@@ -73,7 +73,7 @@ private:
     };
 
 
-    // XXX: TxRxKey = guid (24 bit MSG) + ttagid (8 bit LSB)
+    // XXX: TxRxKey = guid (24 bit MSB) + ttagid (8 bit LSB)
     // TODO: encode tx port in in packet and use as part of key
     typedef quint32 TxRxKey;
     QHash<TxRxKey, TtagData> txHash_;