OrderedDict fix