Use new version of i18n