Third seed Dominic Thiem survived a huge scare to reach the Roland Garros quarter-finals for a fifth straight year on Sunday, battling to a 6-4, 6-4, 5-7, 3-6, 6-3 win over French wildcard Hugo Gaston, the world No 239.
US Open champion Thiem, the runner-up to Rafael Nadal for the last two years in Paris, will face Argentine 12th seed Diego Schwartzman for a place in the semi-finals.
"He plays drop shots from another planet," said 27-year-old Thiem. "He sprinted like 400 times to the net.
"I was lucky to make it through today. He will be a huge player in the future and bring a lot of joy to this stadium."
Defeat for Gaston ended home hopes in the men's singles for another year but he went down fighting, having knocked out former champion Stan Wawrinka in five sets in the previous round.
After being swept aside in the first two sets, he took the third on a fifth set point and levelled the tie with a break in the fourth game of the fourth set.
However, he played one drop shot too many as Thiem broke for 5-3 in the decider and the Austrian wrapped up the three-hour 32-minute tie when his 20-year-old opponent flapped a service return into the net.
"I had a break point at 4-4 in the third set, didn't take it and the match changed," added Thiem.
"I lost energy and I couldn't find an answer to those drop shots. But I found some energy at the end."
French Open results at Roland Garros on Sunday, the eighth day of the delayed 2020 championship (x denotes seeded player):
Diego Schwartzman (ARG x12) bt Lorenzo Sonego (ITA) 6-1, 6-3, 6-4
Dominic Thiem (AUT x3) bt Hugo Gaston (FRA) 6-4, 6-4, 5-7, 3-6, 6-3
Jannik Sinner (ITA) bt Alexander Zverev (GER x6) 6-3, 6-3, 4-6, 6-3
Rafael Nadal (ESP x2) bt Sebastian Korda (USA) 6-1, 6-1, 6-2
Iga Swiatek (POL) bt Simona Halep (ROU x1) 6-1, 6-2
Martina Trevisan (ITA) bt Kiki Bertens (NED x5) 6-4, 6-4
Elina Svitolina (UKR x3) bt Caroline Garcia (FRA) 6-1, 6-3
Nadia Podoroska (ARG) bt Barbora Krejcikova (CZE) 2-6, 6-2, 6-3