issue #717 fixed