Patch for an Issue #1066