fix #24735