Fix the other infinite loop