Fix uniqueness