Dave/iterator ipnum bug fix