tag support fix