64-bit bugfix?