Rafael Nadal improved his record on clay this season to 15-0 and won a record 18th Masters title Sunday, beating top-ranked Roger Federer 6-4, 7-6 (5) in the Madrid final Sunday.

“I’m very happy with everything so far this year. I think I’ve returned to my top form and that’s the most important thing for me,” Nadal said. “Am I favorite to win at Roland Garros? I was last year and I lost.”

Nadal, hampered by nagging knee injuries last season, reversed the result of the 2009 final—the last time he and Federer faced each other—to win in Madrid for a second time and move one Masters title ahead of Andre Agassi and two in front of Federer.

“The most important thing is winning at home; winning in Madrid is a dream. After that, I think about the ranking,” said Nadal. “Against this opponent, it’s always going to be difficult.”Rafa will return to No. 2 in Monday’s rankings.