Bug Fixed: better Timezone handling