Swiss eighth seed Roger Federer regained his composure during a heated battle with Croatia's Marin Cilic to reach the French Open third round.
Federer, 39, had some testy exchanges with the umpire on his way to a 6-2 2-6 7-6 (7-4) 6-2 win on the Paris clay.
Top seed Novak Djokovic produced a focused performance to reach the third round for a 16th consecutive year.
The 34-year-old Serb won 6-3 6-2 6-4 in his first career meeting with tricky Uruguayan Pablo Cuevas.
Djokovic will face Lithuania's Ricardas Berankis, ranked 93rd in the world, in the last 32.