Bugfix fightclub