Merge pull request #1057 from TheBlueMatt/2021-08-invoice-fails