Fixed check for amount type, can also be long