fix #23341