It would be a lot cheaper to stop allowing no brand cheap crap with no accountability to be drop shipped from China. There are clear and well defined safety standards for lithium batteries and they're just being ignored. They won't prevent 100% of failures but 99.9% if they're followed.