Fix for team indexes not being set properly