Fightclub bugfix