Fixes tagging