Fix for teams with spaces