better TZ handling