Patch for an Issue #970