fix #21603