Avoid problems when only one robot entity for TA1
Merge branch 'hcostelha'