Patch for an Issue #982