Issue #764