fix #24287