Fix double validation bug
Validation touble fixed