fix #30941