Patch for an Issue #1019