Lemma 6.10.12 requires a careful definition of Z, close #574