fixes for #4