32-bit bugfix