fix #23648