Fix for #224.