Re-fix iteration.