Decklid hinge pin issue

[runner4fun]

I have a 964 decklid w/ electric spoiler on my 1983 SC backdate 911. A couple of times while driving, the retaining clip on the pin that mounts the decklid hinge to the chassis has come off. It has now happened with the hinge pin on both sides of the decklid.

Today this happened on the driver side and it took an hour of fooling around with the decklid to get it open so I could reinstall the pin.

I plan to replace the two hinge pins with 10mm bolts and lock nuts.

Has anyone else had this problem? Thanks