issue #684 fixed