Fixing tag splitting