i18n prepared and resolved critical issue