Infinite loop improved