Fix #25757