Fixed argument checking