Fix order of tagging