Another attempt at fixing links