Improve link compatbility