fixed current iteration issue