fix #20869