Tweak for #664