fix #23366

Yet another and probably still not the last...
Attempt to fix workspaces

but I'm affaid more work is needed for those