tweak for #85