Workaround workbench limitations