fixing validations