Issue #895