Multiple barbarian states + quick fix