Fix voodoo with TAGs