fix the validations