Re-fix timezone calculation