Stability improvement in i18n