64-bit safety from Hieu