fix #20996 #20994