Fix for 64-bit int to long