fixed validations
fixed validations