work on #717
fixes #708