Fixed the handling of organizers