issue #677 fixed