fix arglist handling