change handling of tag
change handling of tag