Patch for an Issue #434