Fixed args parsing