Iv'e got an 1894cl in .32-20 and its making me nuts. Twice the carrier plunger button has come un-staked from its retaining cap and the second time it stretched out the spring so I can't just put it back together again. Are these plunger kits I see on line that use an e- clip worth it ? Will they end this pain in the neck problem?