fixes for #120