Fixed bugs with \z