Fixed issue with links