Fix overloading for 64-bit ints (revised)