Fix Billing calculation