refinements for #34