Fix Charge
Merge pull request #1282 from Fuzzysqurl/master

Fix Charge