Fixing self-links again