Validation fix2