Patch for an Issue #979