more tag fixing