Fix handling of multiple args