Unbreak Teambuilder

Fixes #73

Not perfect, but it works.