fix #23164