Bug fix: now using correct calling in iterator.