Fix for team scrambling