fixed when there are no tribes
Merge remote-tracking branch 'origin/master'