Fix for correct billing with goods and services.