Patch for an Issue #1079