Validation bug fixed