Small change in argument checking