bugfix with teamstubs