Issue #969

Issue #969