Fix argument handling for set command