Fixed uniqueness