Validation fix 2