Sorry it took so long to get back to this...
Ideally, the cylinder should stop turning and be in full lockup with the bolt just before the hammer is caught by the sear.
So if the sear clicks before the cylinder stops? Would the fix be different for DA/SA than SAO? Would it be a fix that I can do, or does it involve new parts?