Fixed tagging
Doing this on a different branch to avoid confusion