fix #23366  3rd batch

and still surely not the last