Correct timezone handling in both implementations