Solve charge issue