Use correct iterator for an OrderedDict
Merge branch 'fix_iterator'