TagManager wrap correction