fixed current iteration issue
fixed current iteration issue