Issue #968