Andy Murray huffed and puffed before booking his place in round three of the French Open with victory over Martin Klizan.
The first set on Court Suzanne Lenglen was a horror show for the world number one against a player who almost skipped Roland Garros because of a calf injury.
But Murray turned things around to win 6-7 (3/7) 6-2 6-2 7-6 (7/3) and set up a third-round clash against former US Open champion Juan Martin Del Potro.
It is tough to see Murray winning that one without a significant improvement in his form, although Del Potro was struggling physically before second-round opponent Nicolas Almagro was forced to retire with a knee injury.
World number three Stan Wawrinka came out on top in his slugfest with Ukraine's Alexandr Dolgopolov to win 6-4 7-6(5) 7-5.
The 2015 French Open champion, who has yet to drop a set here, may have won in three sets but it was tougher than it looked with Dolgopolov, a former top-20 player giving him a run for his money.
They broke each other once early in the first set and both players aggressively looked for quick winners with their rallies lasting an average of 2.8 shots.
But the 32-year-old Wawrinka, aiming to become only the third man in the professional era to win three or more slams after turning 30, squeezed in another break to snatch the first set with a fierce backhand down the line.
The pair traded blows in a finely balanced second set before taking it into a tiebreak, with Wawrinka again emerging victorious. He sealed the second set with an ace.
It was a similar story in the third set with both players pummelling each other until Wawrinka broke Dolgopolov a second time to clinch victory and deny the world number 89 his first third round spot in Paris since 2011.
An angry Nick Kyrgios was knocked out of the tournament, going down 5-7 6-4 6-1 6-2 to South African Kevin Anderson in the second round.
The temperamental Australian destroyed two rackets, including one that he smashed six times onto a cooler, and was handed a penalty point at the end of the second set.
The 18th seed has never made it past the third round at the Paris grand slam.
Anderson next faces Britain's Kyle Edmund.
