Issue #708