Fix OrderedDict