Fixed TZ bug