fixes for #7