fixed validations