Fix issue #869