fix #23930