64-bit safety fix