Handle clusters with the same name correctly