really fix #25471