Iterator bug is fixed.