Fix beforeBattleMatchup bug