Fixing timezone noise the right way