Fixed buggy links