World number one Novak Djokovic overcame early physical struggles to beat Pablo Carreno Busta and reach the French Open semi-finals.
The Serb arrived on court with tape on his neck, repeatedly massaged his left biceps and grimaced on his way to losing the first set, but went on to win 4-6 6-2 6-3 6-4.
It was a rematch of September's US Open encounter where Djokovic was defaulted for hitting a line judge with a ball.
Djokovic faces Stefanos Tsitsipas next.
"It didn't feel great - neck and a few more things. I don't want to talk about that too much in detail," Djokovic, 33, told Eurosport.