Fix data with unique identites