I also used another 18650 with more capacity first, works wonderfully. What I have to say: it is easier to charge the battery in the lamp than to try to replace the empty battery, the change is a bit fiddly (which is basically okay if you consider that the P7R has a charging port and is designed to charge the battery in the lamp...). Never had any problems with the replacement battery).