Fix infinite loop...