~ fixed nullpointer when tag is null