Tim, Oh yeah, the safety is one of the things that don't work right now (it was purchased cheap, as a 'As is, do not fire' item at Williams Gunsite), but since I'm only shooting on a private range, and I'm not carrying it between even shot strings with any ammo loaded, it's priority is just behind eliminating any chance of a full-auto burst! It's a really old frame that I installed a 1932 barrel & extension on, and I had to grind off a small lug on the frame, because the lug had been eliminated on the model the newer barrel came off of, so it didn't have the corresponding groove, and the internal workings of this pistol are not only complex, but a screaming PITA to assemble... Obviously lots of hand fitting, too. I can see why Germany never adopted this pistol, I just can't figure out why a few other countries did!