Fixed bug on item iteration