Fix for 32-bit