Novak Djokovic celebrated his 38th birthday with a revenge victory over Matteo Arnaldi to reach the Geneva Open semi-finals.
Djokovic was beaten by the Italian in Madrid in April in what was a third straight loss for the Serb great in a mixed clay-court season.
However, Djokovic came through a stern test in damp conditions to beat Arnaldi 6-4 6-4 and continue his French Open preparations in positive fashion.
Djokovic is now within two wins of achieving his 100th ATP Tour-level singles title - a feat only achieved by Jimmy Connors and Roger Federer in the Open era.
"Last year I played semi-finals. Hopefully this year I can go at least a step further - that's the goal," said Djokovic, who was presented with a birthday cake following his on-court interview.
"I think I am playing really good tennis. Today there was a lot of tension on the court."
Djokovic awaits the winner of Thursday's last quarter-final between Britain's Cameron Norrie and Australian Alexei Popyrin.
