[ERROR FIXED]: Infinite loop