Fix subspace nesting