Fixed buggy tagging.