Bugfix for adding Workspace