Corrected timezone handling