Merge pull request #1134 from sjpadgett/billing-bug