Patch for an Issue #1058