Quick fix for billing