Issue #987