1.1.7

diff --git a/WellEater.lua b/WellEater.lua
index e4bdfb7..f705069 100644
--- a/WellEater.lua
+++ b/WellEater.lua
@@ -2,7 +2,7 @@ WellEater = WellEater or {}
 WellEater.WELLEATER_SAVED_VERSION = 1
 WellEater.AddonName = "WellEater"
 WellEater.DisplayName = "|cFFFFFFWell |c0099FFEater|r"
-WellEater.Version = "1.1.6"
+WellEater.Version = "1.1.7"
 WellEater.Author = "|c5EFFF5esorochinskiy|r"
 local NAMESPACE = {}
 NAMESPACE.settingsDefaults = {
@@ -334,17 +334,18 @@ local function checkAndRepair()
                         local formattedName
                         local chatFormattedName
                         if IsItemNonCrownRepairKit(BAG_BACKPACK, slotId) then
-                            local iName = GetItemLinkName(GetItemLink(BAG_WORN, testSlot))
+                            local withName = GetItemLink(BAG_BACKPACK, slotId, LINK_STYLE_BRACKETS)
+                            RepairItemWithRepairKit(BAG_WORN, testSlot, BAG_BACKPACK, slotId)
+                            local iLinkName = GetItemLink(BAG_WORN, testSlot, LINK_STYLE_BRACKETS)
+                            local iName = GetItemLinkName(iLinkName)
                             formattedName = zo_strformat(locale.youRepairScreen, iName) -- no control codes
                             chatFormattedName = zo_strformat(locale.youRepair,
-                                    GetItemLink(BAG_WORN, testSlot, LINK_STYLE_BRACKETS),
-                                    GetItemLink(BAG_BACKPACK, slotId, LINK_STYLE_BRACKETS)
+                                    iLinkName,
+                                    withName
                             )
-                            RepairItemWithRepairKit(BAG_WORN, testSlot, BAG_BACKPACK, slotId)
-
                         elseif locSettings.useCrownRepair then
-                            formattedName = locale.allRepair
-                            chatFormattedName = zo_strformat(locale.allRepairScreen,
+                            formattedName = locale.allRepairScreen
+                            chatFormattedName = zo_strformat(locale.allRepair,
                                     GetItemLink(BAG_BACKPACK, slotId, LINK_STYLE_BRACKETS))
                             tryToUseItem(BAG_BACKPACK, slotId)
                             wasCrownUsed = true
@@ -422,14 +423,16 @@ local function checkEquippedWeapon()
                         local useThis = (specializedItemType ~= SPECIALIZED_ITEMTYPE_CROWN_ITEM or
                                 (useCrownGems and specializedItemType == SPECIALIZED_ITEMTYPE_CROWN_ITEM))
                         if useThis then
-                            local iName = GetItemLinkName(GetItemLink(BAG_WORN, testSlot))
+                            local withName = GetItemLink(BAG_BACKPACK, slotId, LINK_STYLE_BRACKETS)
+                            ChargeItemWithSoulGem(BAG_WORN, testSlot, BAG_BACKPACK, slotId)
+                            local iLinkName = GetItemLink(BAG_WORN, testSlot, LINK_STYLE_BRACKETS)
+                            local iName = GetItemLinkName(iLinkName)
                             local locale = WellEater:getLocale()
-                            local formattedName = zo_strformat(locale.youCharge, iName) -- no control codes
-                            local chatFormattedName = zo_strformat(locale.youChargeScreen,
-                                    GetItemLink(BAG_WORN, testSlot, LINK_STYLE_BRACKETS),
-                                    GetItemLink(BAG_BACKPACK, slotId, LINK_STYLE_BRACKETS)
+                            local formattedName = zo_strformat(locale.youChargeScreen, iName) -- no control codes
+                            local chatFormattedName = zo_strformat(locale.youCharge,
+                                    iLinkName,
+                                    withName
                             )
-                            ChargeItemWithSoulGem(BAG_WORN, testSlot, BAG_BACKPACK, slotId)
                             df("[%s] %s", WellEater.AddonName, chatFormattedName)
                             local toScreen = locSettings.notifyToScreen
                             if toScreen then
diff --git a/WellEater.txt b/WellEater.txt
index bc6dd79..6ffc60b 100644
--- a/WellEater.txt
+++ b/WellEater.txt
@@ -31,7 +31,7 @@
 ## Author: |c5EFFF5esorochinskiy|r
 ## APIVersion: 101033 101034 101035 101036
 ## Description: Auto eat your preferred meals provided by your inventory after food or drink buff expiration. Provides weapon autoload and armor autorepair
-## Version: 1.1.6
+## Version: 1.1.7
 ## SavedVariables: WellEater_Settings
 ## DependsOn: LibAddonMenu-2.0>=28

diff --git a/lang/de.lua b/lang/de.lua
index 2b60238..c6614fc 100644
--- a/lang/de.lua
+++ b/lang/de.lua
@@ -21,8 +21,8 @@ local L = {
     youChargeScreen = "Eingeladen <<1>>",
     youRepair = "Reparieren <<1>> mit <<2>>",
     youRepairScreen = "Reparieren <<1>>",
-    allRepair = "Alles wird repariert",
-    allRepairScreen = "Alles wird repariert mit <<1>>",
+    allRepair= "Alles wird repariert mit <<1>>",
+    allRepairScreen  = "Alles wird repariert",
     outputSetupHeader = "Anzeigen die Nachricht",
     outputOnScreen = "Auf den Bildschirm",
     outputSetupHeader_TT = "Wenn die Einstellung aktiviert ist, wird eine Nachricht über das gegessene Gericht" ..
diff --git a/lang/en.lua b/lang/en.lua
index 1b40580..556eb22 100644
--- a/lang/en.lua
+++ b/lang/en.lua
@@ -20,8 +20,8 @@ local L = {
     youChargeScreen = "Charged <<1>>",
     youRepair = "Repaired <<1>> with <<2>>",
     youRepairScreen = "Repaired <<1>>",
-    allRepair = "All repaired",
-    allRepairScreen = "All repaired with <<1>>",
+    allRepair = "All repaired with <<1>>",
+    allRepairScreen = "All repaired",
     outputSetupHeader = "notification output",
     outputOnScreen = "On screen",
     outputSetupHeader_TT = "When on the notification about the meal eaten or weapon recharged is written to the screen not only to the debug log",
diff --git a/lang/ru.lua b/lang/ru.lua
index 0fde2be..1277ce4 100644
--- a/lang/ru.lua
+++ b/lang/ru.lua
@@ -21,8 +21,8 @@ local L = {
     youChargeScreen = "Заряжено <<1>>",
     youRepair = "Отремонтировано <<1>> при помощи <<2>>",
     youRepairScreen = "Отремонтировано <<1>>",
-    allRepair = "Все отремонтировано",
-    allRepairScreen = "Все отремонтировано при помощи <<1>>",
+    allRepair = "Все отремонтировано при помощи <<1>>",
+    allRepairScreen = "Все отремонтировано",
     outputSetupHeader = "Вывод сообщения",
     outputOnScreen = "На экран",
     outputSetupHeader_TT = "При включенной настройке сообщение о съеденном блюде или перезарядке оружия будет выведено на экран, а не только" ..