fix #25867