Fixed args catch