partially fix #21583