Charges Service Fix