Merge "Fix bad loop logic"