Patch for an Issue #1018