Issue #963