Added more anchor handling.