fixes for #77