Fixing data format to i18n