Rafael Nadal dropped a set at the French Open for only the second time since 2015 but recovered to beat David Goffin and reach the fourth round.
The 11-time champion had won all his matches in straight sets the last three years apart from in the quarter-finals 12 months ago, when he lost one set against Diego Schwartzman.
Nadal tore through the opening two sets against 27th seed Goffin but the Belgian fought back impressively to take the third before the Spaniard completed a 6-1 6-3 4-6 6-3 victory.
The win saw Nadal match Federer, who defeated Casper Ruud earlier, by making the last 16 here for the 14th time, an all-time record.
On the 10th anniversary of his most famous defeat, when he was beaten in the fourth round by Robin Soderling to lose on the Paris clay for the first time, Nadal seemed in a hurry to write a happier story on May 31.
He raced through the first five games, and Goffin, who had won his first two matches with impressive ease, struggled simply to get a foothold in the match.
But things changed in the third set as Goffin matched his opponent stride for stride before breaking serve for the first time in the match in the ninth game and serving it out.
It was the first set Goffin has managed to win against Nadal in four meetings on clay, and the earliest round in which the 32-year-old has lost a set here for six years.
But Goffin was unable to turn a set into a real challenge to Nadal, who wrapped up victory after two hours and 49 minutes.
