Fix regression (recursive loop)