another fix for #25896