Infinite loop fixed upstream