I think I fixed the infinite loop?