Lock-on after drilling