Timezone bug fix

Moved the timezone setter to be static