My Witness Elite Match (9 mm) has recently started doubling and went full auto on my first mag last time out. I have Henning's trigger and firing pin/spring. The problem I think I see is that the firing pin safety is catching the sear when it passes over it as it cycles. With the safety in place, I cannot cycle the pistol manually and have the hammer stay cocked, it always trips - when I remove it it seems fine. When I see the pic of the safety on EAA's site, mine looks taller but very poor detail on the pic. A measurement of the height of the part in your gun would also be helpful for comparison Not an expensive part (shipping costs more) so am thinking about grinding it down to be flush with the rail it fits into or at least enough so it doesn't contact the sear. Only about 3000 rounds thru it so wear on parts shouldn't be an issue. Somewhat mechanically challenged so your patience and any thoughts would be appreciated.