Good day, JamesCrozier.

This issue is still ongoing and our engineers are continuously working to have a permanent fix.

As soon as resolution has been released for this, our Support Team will update you through email. In this case, I suggest creating the invoice separately from the estimate. 

Please know that we're actively working towards resolving this as soon as possible. You've got me if you have any other concerns. I'm always glad to help.