fix #25017