Link parsing - proposed fix