This is a good example of something that needs to be put away for whatever period of time may be necessary until perhaps something comes along that appears to be a decent solution. Rushing into a quick fix will be expensive.

I surely wouldn't get in any hurry about a fix. Just put the gun away for awhile, maybe show it now and then as an example of what can happen. Move on to something else and let this one just be forgotten for a while.
JR

Be strong, be of good courage.
God bless America, long live the Republic.