issue #869 fixed