Fix regression after i18n