issue #691 fixed