Fix Bug2

iterator bugs... T_T