More consistent behavior between 32 and 64-bit platforms