Merge "Fix 64-bit comparison"