yeah, i solved the battery problem in mine by taking double sided tape instead of epoxy