Teams - Bugfix