fixed validations bug