Issue #778