Account for new workspace offset #2