* Validation fix