Workaround workbench limitations
Merge pull request #56 from open-craft/dragonfi-workbench-workaround

Workaround workbench limitations