Removed OrderedDict, fixing ordering bug.