Merge pull request #1693 from alexvh/teamcoco_fix