Fix 'too many args' bug due to wildcard expansion