Fix for #828