Fix EntrySet iterator on FactoryMap

Fix EntrySet iterator on FactoryMap