fixing i18n part 2