Fixed self-validation.