Another tweak for #1028