fixes for #117