fix BillingData save in case of first creation