Issue #717