Fix charges for now