Fix 64bit safety