If you often change the handguard, here is a simple modification you can make. I tapped the existing hole with an M3 tap and secured the ferrule using an M3 x 12 mm set screw. Since the screw is a bit long, I used a Dremel to trim it to the appropriate length.