Fixed break of tagging.