I'm working on a short term fix for this