OrganizationFields fix