fixes for #81