fixing validation.