fix workspace reconstitution