Merge "First pass loop bug."