[Validator] Fix #10648