Avoid recursion. Added wrapper for iterator.