Validation fix 3