Patch for 4.5.0