add workaround on tag function