Implemented link fix