Iterator fixed