Fixed args handling (again)