Attempt at fixing Iterator