Hopefully the real fix for GE in workspaces