Fix:
- Search stuck in infinite loop (for real this time)