fix #25368 comment #16