Patch for an Issue #442