Fixed iterator wrapper