diff --git a/client.cpp b/client.cpp
index 2cd3bed456..3c22bc0806 100644
--- a/client.cpp
+++ b/client.cpp
@@ -980,7 +980,8 @@ void Client::pingWindow()
 
 void Client::gotPing( Time timestamp )
     {
-    if( timestamp != ping_timestamp )
+    // just plain compare is not good enough because of 64bit and truncating and whatnot
+    if( NET::timestampCompare( timestamp, ping_timestamp ) != 0 )
         return;
     delete ping_timer;
     ping_timer = NULL;