“I never said I was going to be done at Rio,” said the world number two on Tuesday as he prepared to open against Andreas Seppi at the Paris Masters. “I just said that was like my next long-term goal I had.
“It’s not around the corner, but it’s not that far off anymore.”
Swiss precision is a way of life for the 34-year-old Grand Slam hero, fresh from his seventh home title at the weekend in Basel over Rafael Nadal.
“I always plan over a year ahead. Basically 2017 is locked up. That’s the way I’ve got to plan if I feel like I’m going to still be playing for some time.
“As long as I don’t know when the end is, that’s how you plan, into infinity if you like.
“You never know. But, of course, Rio is one of the goals for next year, like so many other tournaments, as well.”