32-bit fix