That should solve the time zone issue for now