Issue #706