Really fix the tz bug