Final fix for Fast Charge