fixes for #3