Also remap zX for folding