Added proper setCurrent position for iterator