Fixed links issue