issue #19797: Fix workspace.