Another tweak for #965