Allow for remapped z=

Fixes #11