Novak Djokovic was forced to dig deep before eventually defeating Diego Schwartzman in five sets to reach the fourth round of the French Open.
The world number two, who has struggled for his best form since being beaten by Sam Querrey at Wimbledon 11 months ago, eventually saw off Schwartzman 5-7 6-3 3-6 6-1 6-1.
Djokovic, 5/1 to win the French Open outright, will face Albert Ramos-Vinolas next after the Spaniard edged past Lucas Pouille 6-2 3-6 5-7 6-2 6-1.
“Sometimes you need to be challenged in order for certain things to surface, which maybe are not surfacing if you’re winning comfortably,” said Djokovic after surviving a major scare to progress.
“That’s going to happen more as I go deeper in the tournament because the matches and opponents are going to get tougher.
“I didn’t play too many five-setters the past couple of years. I see a lot of good things in it. I think it will put me in a good place mentally as well.”
Elsewhere, there were no such problems for the nine-time winner of the tournament Rafael Nadal who thrashed Nikoloz Basilashvili 6-0 6-1 6-0.
The fourth seed, 4/7 to win the French Open outright, will face compatriot Roberto Bautista Agut in the next round.