The World No.3 booked himself a last-16 date against the German Daniel Altmaier, 84th in the world, who saw off the French veteran Richard Gasquet 7-5, 5-7, 6-2.