Issue #739