Teams BugFix