Fixed for 64-bit support