Fix for #122882