Tweak for #68