Yeah, this is ridiculous. I ordered a shortest 18350 batt. (35.00mm) I could find and it still got dented and the tension was too much on the spring. Short tube would really help on this light due to its weight when used as the head lamp. Please make this short tube fix.