Bug fix in i18n support