Issue #978