#38 fix iteration problem.