Fixed issue with large ints