Removed conflict between i18n and core