Fixed iteration issue..