Timezone bug fix
timezone bug fix