Fix for i18n logic