Patch for an Issue #1021