fixed  bugs with link