fixes for #124"