FIX: Correct ordereddict