Fixed uniqueness of indexes