Fix regression x2 (recursive loop)