Patch for an Issue #1069