Now doesn't break on cgi links