#424 workspaces patch