fixed up tagging