Fix for Teams