fix timezone calculation