Migrate to the tag on stop too.