Bugfix: Permit both int and long