Patch for an Issue #1020