Fix behaviour of by-reference "z"