fix #23496