this might fix agent-specific invoicing when migrated from 1.7?