fix tag support