fix #23047