Manchester United escaped a tough round-of-16 clash with Paris Saint-Germain after Champions League draw chaos in Nyon on Monday.
UEFA were forced to stage the draw again after software errors rendered the first draw void.
Following the confusion which led to United being erroneously picked out a pot to face Villarreal, and then left out of the potential opponents to face Atletico Madrid, UEFA declared the draw void and said it would be repeated later in the day.
Ralf Rangnick's side were paired with Paris Saint-Germain in the original draw which saw their odds for the title eased from 14/1 to 20s. Their hopes have improved slightly after they were pitted against Spanish champions Atletico Madrid in the rerun. Nevertheless, the Red Devils remain 16/1 for European glory.
Bayern Munich were the big winners in the second attempt.
Having faced a trip to Atletico in the original draw, the German giants were then handed a tie against rank outsiders FC Salzburg in the rerun. It saw their odds trimmed to 7/2.
Defending champions Chelsea will face Lille - the only fixture to be a repeat of one drawn earlier on Monday. It saw their odds on a follow-up success cut from 9/1 to 13/2.
The other fixtures will see PSG take on Real Madrid, Benfica come up against Ajax and Villarreal play Juventus.
City manager Pep Guardiola believes UEFA made the correct decision to repeat the draw.
Speaking at a press conference to preview his side's game with Leeds on Tuesday, Guardiola said: "I think it is fair. It was a mistake but sometimes these things can happen.
"If there was a mistake you have to repeat so it is not suspicious."
The first leg ties will take place on the weeks of February 15 and 16, and 22 and 23, with the return legs following on March 8 and 9, and 15 and 16.