fix #24759