Patch for 4.21