Fixing a Starter Solenoid?

[Hamamatsu Nippon]

Does anyone have experience taking the starter solenoid apart? Mine was staying on so I tore into it and found that when the plunger retracts, the contact bar stays connected. I found a loose fiber washer and a half part of a washer that I suppose holds the contact bar to the plunger. There is a groove in the plunger so I fitted a circlip from a carb needle, and the fiber washer that was loose in the solenoid. Have I done it correct, is this how it is supposed to be?