Test and fix for #124