bugfix workspace management