Bugfixing invoicing