fix tag behaviour