Made it work with latest timezone info