Fix issue with team selection.