Teams Bugfix