I feel your pain. Got rid of my fine working samsung s6 because the battery was so shit. A shame because it was a good phone other wise. Now it's in the drawer for just that reason.