better anchor handling