fix #24999