Patch for an Issue #1060