Roger Federer came from a set down to overcome Canadian Milos Raonic in the second round of the Madrid Masters.
The world number three ensured the same outcome as when the pair met at Indian Wells in March, winning 4-6 7-5 7-6 (7-4).
It was a hard-fought encounter, lasting over two hours, but Federer secured victory in a crucial final-set tie-break to set up an encounter with Richard Gasquet in round three.
The Swiss, playing his first game in five weeks, must have feared the worst in the early stages as his opponent's serve was clinical, earning him 28 out of 29 points.
Federer got a handle on Raonic's serve in the second, breaking at the opportune time to claim the set.
It was a nervy final set, with the Canadian twice squandering opportunities to break Federer's serve. The Swiss punished his opponent's wastefulness, forcing two mini-breaks before clinching victory with a cross-court winner.