Fix to support 64-bit