fixed validations
Validation Fixed