Improved link helper, but there is a problem...