Fixed args check