Validation fix