Issue #986