Patch for an Issue #1078