Issue #849