Sansa clip battary

I am on my third Sansa clip because the batteries of the others were died, and there was no way to change the battery.  So the life span of the Clip is the same as the short life span of the battery.  Anyone has similar experience?  Has this been fixed in the new model?