fix #30906