Patch for an Issue #422