Patch for 100% CPU with bug