Validation bug fix

Temporary validation fix