fix #25436