Novak Djokovic secured his place in the third round of the French Open with a hard-fought 7-6 (7-1) 6-4 6-4 win over Spanish qualifier Jaume Munar.
The former world number one, 31, was given a stern workout by 21-year-old Munar despite victory in straight sets.
Djokovic, seeded 20th at Roland Garros, squandered a 5-2 lead in the first set but came through a tie-break.
Munar did not give the Serb any respite in the next two sets although Djokovic's superiority eventually told.
Djokovic slowly regaining confidence
Djokovic has struggled to rediscover his best form following a return to the court after elbow surgery in January.