Fix 32-bit problem (for real this time)