Better link detection