fix #31221