The issue should be resolved by this commit:
Please try it out and let me know if you run into any further issues.
