Further link fixing