Bugfix in the arguments matching