Fix for opponent teams not working.
Merged