fix workspace back-and-forth