Patch for an Issue #981