- Fixed 64-bit bug