64-bit fix