Removed 32 bit hack