[BUGFIX] Fixing wrapping a tag into the same tag