Modify the fix for pmi iterator.