Fix #25169