fix #24773