Issue #964