Fixed bugs on link