fix #31086