Fixed timezone handling