Fixing the tags