Fix for #88344