First test at fixing links