Fixed argument check repetition