Made iteration always update properly