Final fix for links - second attempt