Fixed the tagname format