Fix the loop again