Roger Federer ended Guillermo Coria's streak of clay-court wins at 31 to win the Hamburg Masters for a second time.
Federer was not at his supreme best, particularly early on, but rallied to claim the third Masters Series title of his career with a 4-6 6-4 6-2 6-3 win.
The win will give the world number one a huge psychological boost going into the French Open, knowing he has the measure of the best there is on clay.
Coria was hampered by a blister on his hand, but Federer was a worthy winner.
Yet Federer looked totally out of sorts as Coria took the first set.
Coria's incredible consistency and tireless running was too much as a misfiring Federer produced a stream of unforced errors.
But after breaking Coria for the first time at the start of the second set Federer began to find his form.
And, as he did so, Coria began to weaken and was increasingly troubled by a blister on his hitting hand.
In the end Federer was totally dominant and showed he is capable of winning on any surface.
"It's fantastic. I am very proud to win here for the second time," he said.
"I have been playing incredible tennis for the last 12 months. I am winning every third tournament I play - that's crazy."