Fixed inf loop :)