Improve compatibility for link