Another attempt to fix links