Fix for #16088