Fix data and add link to itself