[Highlight] Fixed: Infinite loop