Fix for #869