added fix for @ links