Fix infinite loop!