Fixed 64-bit build