Issue #982