fix #25340