Stan Wawrinka was taken to the wire by Sergiy Stakhovsky and had to save two match points before securing a 6-4 4-6 7-6 (10-8) win in the second round of the Open 13.
The number one seed was playing in his first match since losing to Milos Raonic in the Australian Open, and avoided a repeat of his 2015 quarter-final exit at the Ukrainian's hands with a narrow triumph.
The Swiss took the first set but was forced to save three break points, capitalising on poor second serves from the Stakhovsky who won just six points from a possible 16 after missing his first.
Stakhovsky - ranked 77 places below his opponent - fought back with an impeccable showing on his first serve in the second set, winning all 11 points available to him and securing the only break point to level things up.
The Ukrainian failed to capitalise on two chances to edge into the quarter-finals in the third-set tie-break, and after his challenge of a Wawrinka volley went the way of the Swiss, he was unable to stop him taking the match with the next point.
World number four Wawrinka will meet the victor of the clash between eighth seed Benoit Paire and Vincent Millot, who overcame Nicolas Mahut 6-7 (1-7) 6-2 6-3.
Croatian fourth seed Marin Cilic booked his place in the last eight with a 4-6 6-3 7-5 win over Dutchman Robin Haase.
Wildcard Quentin Halys battled back from behind to beat David Guez in the first round, producing 17 aces in a 6-7 (5-7) 6-2 6-3 victory that sets up a meeting with Andrey Kuznetsov in the next round.
Number six seed David Goffin advanced to the quarter-finals as qualifier Mischa Zverev retired while 6-1 2-0 down.