Fixing issue #2: TZ issue was half-fixed