fix #24718 again