Fix infinite loop. Oooops...