Improve my fix for #698232