Sure, you are right. Let's see when the parts arrives and test them. If it's not ok then I will use only 18650's but HCigar will never see again a penny from me and I own already 3 mods from them. I had to fix the cabling of the Nano myself and only the VT Inbox until now doesn't have any problem. For sure HCigar should put more attention in designing and assembling their products or they will not last long on the market.