Fix overflow long -> int