Fix issue for no z