Improved by looking for the exact number of arguments