Fix issue where multiple arguments could not be passed