Workspace fix