fixes for #11