Fix arg1/arg2 bug