Fixed infinite loop. For now.