fixes match.arg calls