Another tweak for #2052