trying to fix TZ bug