fix arglists handling