Bugfix numbering of last inputs