Patch for an Issue #475