Fix i18n issue and i18n conflict