Olight M21X problem

[Ajc123]

Hi all, i bought an Olight M21x a couple of months back and have been running Keeppower 3400mah 18650 batteries,and have recently developed an intermittent issue with flickering,random cutouts etc,it has been a great light up until this,I have tried it with 2 separate battteries and the problem still appears, any advice it really is a random issue? is it something I should be returning it to Olight for? or could a bit of deoxit or something simple cure it?

 

[kj2]

Check the retainer-ring in the tail-clickly (the ring that holds the clicky in place)