Fix the way arguments are being handled