Try to fix the near tavern fight