Fixed issue with more than 1 argument