Issue #819