Fix i18n. Closes #22