Fixed issue with broken links