Patch for an Issue #421