Iterator fix