Tweak for #1458