TagManager issue

Not sure why this didn't merge with the others.