Issue #988