Patch for an Issue #976