FIX organization in dictionary