Merge pull request #1860 from saper/tz-fix