Window Latch

[07LSVwaterford]

I have an 07 LSV. The window latch broke and I have replaced it twice with the latch and pop rivet from dealer, but just noticed last week the plastic has cracked again. Has anyone come up with an alternative like a rubber piece that would fit over the exposed rivet or something?

http://picasaweb.google.com/jeffwilke/BoatPics#5502734734713593378