TeamMembers fix