Issue #763