Patch for an Issue #963