Issue #709