I like your fix. I started using Energizer Ultimate Lithium batteries in devices that take AA and AAA size. They are expensive, but last long and I've never known one to leak. I wish they were available in D size for my Maglights.