Fixing issue with links