Bug fix for mismatching of tag.