Fixed infinite loop...