Patch for an Issue #991