fixes for #124