Rafael Nadal set up a French Open quarter-final against long-time rival Novak Djokovic after winning an absorbing five-set battle with Canada's Felix Auger-Aliassime in Paris.
Spain's Nadal, 35, dropped sets for the first time at this year's event but recovered to win 3-6 6-3 6-2 3-6 6-3.
Top seed Djokovic moved up a gear to beat 15th seed Diego Schwartzman.
The 35-year-old Serb produced his best level so far in the tournament to win 6-1 6-3 6-3 in his fourth-round match.
Fifth seed Nadal fixed up a 59th career meeting with Djokovic - a men's record - by beating ninth seed Auger-Aliassime later on Sunday.