fix one time charge costs, RT#31429, RT#32894