Actually do the right check for further args