fix #21818