fix for non-teams mode