Another tweak for #987