Rolled back from long(x) to int(x)

Rolled back from long(x) to int(x)