Defending champion Novak Djokovic survived a third-round scare at the French Open to beat unseeded Argentine Diego Schwartzman in five sets.
The Serb came back from two sets to one down to win 5-7 6-3 3-6 6-1 6-1.
Djokovic, 30, finished strongly despite making 55 unforced errors and arguing with umpire Carlos Ramos over a conduct warning.
The second seed goes on to face France's Lucas Pouille or Spain's Albert Ramos-Vinolas.
The presence of new coach Andre Agassi has yet to inspire the 12-time Grand Slam champion to rediscover the form that made him a seemingly untouchable world number one this time last year.