fixed the organization controller.