fixes for #125