Fixed bug that assumed order of items in enumeration was the same for each call to enumerator. Not so.
Authored by: delphidabbler 2010-03-21
Parent: [r694]
Child: [r696]
