Fixing links part 2