final fastcharge fix from maxwen