slight tweaks for #47