Novak Djokovic came through a gruelling four-hour match against Spanish 13th seed Roberto Bautista Agut to reach the last 16 at the French Open.
The 12-time Grand Slam champion was given his toughest test this year but won 6-4 6-7 (6-8) 7-6 (7-4) 6-2 after three hours and 48 minutes.
The Serb, 31, is seeded 20th as he searches for his best form following his return from an elbow injury.
He will play Spain's 30th seed Fernando Verdasco in the fourth round.
Verdasco, 34, earned a shock 7-6 (7-4) 6-2 6-4 win over Grigor Dimitrov - the Bulgarian fourth seed and reigning ATP World Tour Finals champion.