Trying to improve link compatibility