Fixed patch for i18n