fixed class iterator