Fixed organization controller bug