Fix so that we're always in the correct timezone