I added a Badger Ordnance oversized latch to my Daniel Defense that has worked out quite well. I bought just the latch: it was easy to remove the factory part and install the new one. Less than $20 from Brownells.