Another tweak for i18n support