Fix z value issue