fix #23366

At least a first batch