Patch for an Issue #971