Fix # 1 for FastCharge

I implemented the fastcharge logic incorrectly. Minor modification required which I will do in next commit.