Update to support 64-bit :)