fixed itterator issue