Fixed another iterator bug