Better fix for #122028