tweaks for #87