Issue #876