Final link fix