When changing barrels I remove the ejector and firing pin assembly from the bolt. I think that this gives me a better "feel" when setting the headspace on fired fl sized cases. But, sometimes the bolt assembly pin slips out of its hole and jams up the action. I've tried scotch tape to hold the pin in, but that's not generally satisfactory.
Does anyone know a trick to hold the bolt assembly pin in place, with the firing pin out, while setting headspace?

Thanks;
joe b.