Issue #976