Fixed: NPE when using preserve-order and factories.
2 files changed