BUGFIX: Order of input arguments