fixing i18n race condition bug