fix #23557