fix #24842