Fourth seed Alexander Zverev was relieved to escape into the quarter-finals of the French Open after a hard-fought 4-6 6-1 5-7 7-6(2) 6-2 victory over Holger Rune which ended early on Tuesday morning.
The German will next face Australian 11th seed Alex de Minaur in the last eight.
Norwegian seventh seed Casper Ruud defeated American Taylor Fritz 7-6(6) 3-6 6-4 6-2 to book a clash with defending champion Novak Djokovic in the quarter-finals.
Russian teenager Mirra Andreeva continued her flawless form on the Parisian clay, seeing off Varvara Gracheva 7-5 6-2 to set up a showdown with second Aryna Sabalenka in the last eight.