fix #31526