Fix pregame logic