Apply code by Thomas Lehmann to improve timezone handling