z-1 bug fixed