Fixed bug introduced when switching from KeyedList to OrderedDict