fixes #1715 and no i18n tests