Patch for an Issue #1077