Bugfix in timezone calculation