After removing the cluster I found that the rivet which holds the fuel gauge to the backing plate has broken. One of the wires is also broken. What would be the best fix? Is this common?

I am considering soldering the wire and the rivet back on the plate.

Thanks!