fix #21929