Fixed bugs with link