Fix for #124