iterator problem fixed