tz fix from master branch