Bug/fix timezone comparison