Issue #959