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.
The 18-time Grand Slam champion is aiming for a second title in Paris to follow up his sole win in 2016.
Defending champion Rafael Nadal set up a French Open third-round meeting with Britain’s Cameron Norrie by beating long-time opponent Richard Gasquet.
Spanish third seed Nadal, who has known Gasquet since they were juniors, won 6-0 7-5 6-2 on his 35th birthday.
The Spaniard has won a record 13 titles at Roland Garros and is the favourite for another, he is seeded third behind Djokovic and Russia’s Daniil Medvedev because the seeding system is based on the current world rankings.