fixes for #31