fix #35231