Added hyperlink workaround