Issue #969