Fixing argument checking.