I have a used M31 tested working but requires new battery pack.
The nicad batteries are no longer available making this essentially beyond economical repair as the kit to upgrade to Li-Ion with new charger is £55.
A DIY-er may be able to cut open the old battery and replace cells. The charger and base is included.