Fix: Infinite loop