Patch for collision bug