fixes for #85