Added fix for iterator.