fix tag-assignment