Patch for the bug