Fixing an issue with the organization tag.