put back some validations