Validation bug fix