Fixed Issue with links