fixes for #231