Merge "Fix loop iteration bug."