Fixed 'too many arguments' error