fixed Validation bug