Fix i18n regression issue