The armrest latch to my 2013 Sahara Unlimited recently broke off. This is causing the armrest to bounce around when driving and hitting bumps and it's also unable to be "locked". Has anyone successfully replaced the plastic latch and know where I could get one. I've seen posts where people have recommended replacing it with a Tuffy but from what I'm seeing, the insert still requires the existing lid and latch. That would give me additional security but still wouldn't solve the bouncing around issue of the existing lid when driving. Any help or suggestion is appreciated. It's a small fragile piece of plastic so I'd imagine that several people have had this issue before.