Issue #847