Fix android teambuilder!!