Fix ordereddict issue from #13552