Alexander Zverev rallied from a double break down in the fifth set to beat Dutch 26th seed Tallon Griekspoor 3-6, 6-4, 6-2, 4-6, 7-6 (10/3) to reach the French Open last 16 on Saturday.
Zverev trailed 4-1 in the decider but produced an astonishing comeback to make the fourth round at Roland Garros for the seventh consecutive year, the day after the start in Berlin of a trial against him over allegations of assaulting an ex-girlfriend.
Fourth seed Zverev, who effectively ended Rafael Nadal's French Open career in the first round, will meet 13th seed Holger Rune or world number 145 Jozef Kovalik for a place in the quarter-finals.
The German arrived in Paris on the back of winning the Rome Open title and is the only player to reach the semi-finals at the last three French Open tournaments.