Fix #1158 for F31
Address felixcat comments.
Merge pull request #1200 from Sophist-UK/enhance_link_element_f31

Fix #1158 for F31