Issue #995