Patch for an Issue #1052