Timezone break for heroku - need to fix this properly