Issue #845