fix arg handling